Add required properties to schema

Issue-ID: AAI-1826
Change-Id: Ifc7122880e2c98888aa6b478cba3f70fb4c62e52
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>

diff --git a/aai-annotations/src/main/java/org/onap/aai/annotations/Metadata.java b/aai-annotations/src/main/java/org/onap/aai/annotations/Metadata.java
index 8d03d8a..d9e9f0f 100644 (file)
--- a/aai-annotations/src/main/java/org/onap/aai/annotations/Metadata.java
+++ b/aai-annotations/src/main/java/org/onap/aai/annotations/Metadata.java
@@ -39,6 +39,7 @@ public @interface Metadata {
        String defaultValue() default "";
        String searchable() default "";
        String uniqueProps() default "";
+       String requiredProps() default "";
        String uriTemplate() default "";
        String extendsFrom() default "";
        String isAbstract() default "";

diff --git a/aai-annotations/src/main/java/org/onap/aai/schema/enums/ObjectMetadata.java b/aai-annotations/src/main/java/org/onap/aai/schema/enums/ObjectMetadata.java
index a127ba7..39cfdec 100644 (file)
--- a/aai-annotations/src/main/java/org/onap/aai/schema/enums/ObjectMetadata.java
+++ b/aai-annotations/src/main/java/org/onap/aai/schema/enums/ObjectMetadata.java
@@ -60,6 +60,11 @@ public enum ObjectMetadata {
         * <br><b>comma separated list</b>
         */
        UNIQUE_PROPS("uniqueProps"),
+       /**
+        * properties marked as required
+        * <br><b>comma separated list</b>
+        */
+       REQUIRED_PROPS("requiredProps"),
        /**
         * uri template for this object
         */

diff --git a/aai-annotations/src/test/java/org/onap/aai/annotations/AnnotationsTest.java b/aai-annotations/src/test/java/org/onap/aai/annotations/AnnotationsTest.java
index 52c74b6..a518e0c 100644 (file)
--- a/aai-annotations/src/test/java/org/onap/aai/annotations/AnnotationsTest.java
+++ b/aai-annotations/src/test/java/org/onap/aai/annotations/AnnotationsTest.java
@@ -36,6 +36,7 @@ public class AnnotationsTest {
         defaultValue = "",
         searchable = "",
         uniqueProps = "",
+        requiredProps = "",
         uriTemplate = "",
         extendsFrom = "",
         isAbstract = "",

diff --git a/aai-core/src/test/java/org/onap/aai/serialization/db/EdgeRulesTest.java b/aai-core/src/test/java/org/onap/aai/serialization/db/EdgeRulesTest.java
new file mode 100644 (file)
index 0000000..0bb0789
--- /dev/null
+++ b/aai-core/src/test/java/org/onap/aai/serialization/db/EdgeRulesTest.java
@@ -0,0 +1,156 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+package org.onap.aai.serialization.db;
+
+
+import com.google.common.collect.Multimap;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.onap.aai.AAISetup;
+import org.onap.aai.edges.EdgeIngestor;
+import org.onap.aai.edges.EdgeRule;
+import org.onap.aai.edges.EdgeRuleQuery;
+import org.onap.aai.edges.enums.EdgeType;
+import org.onap.aai.edges.exceptions.AmbiguousRuleChoiceException;
+import org.onap.aai.edges.exceptions.EdgeRuleNotFoundException;
+import org.onap.aai.setup.SchemaVersion;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static junit.framework.TestCase.fail;
+import static org.junit.Assert.assertEquals;
+
+public class EdgeRulesTest extends AAISetup {
+
+       //set thrown.expect to whatever a specific test needs
+       //this establishes a default of expecting no exceptions to be thrown
+       @Rule
+       public ExpectedException thrown = ExpectedException.none();
+
+       @Autowired
+       private EdgeIngestor edgeIngestor;
+
+       @Test
+       public void verifyOutDirection() throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
+
+           EdgeRuleQuery ruleQuery = new EdgeRuleQuery
+            .Builder("cloud-region", "flavor")
+            .edgeType(EdgeType.TREE)
+            .build();
+
+               EdgeRule rule = edgeIngestor.getRule(ruleQuery);
+
+               assertEquals("out direction", rule.getDirection(), Direction.IN);
+       }
+
+       @Test
+       public void verifyOutFlippedDirection() throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
+
+        EdgeRuleQuery ruleQuery = new EdgeRuleQuery
+            .Builder("flavor", "cloud-region")
+            .edgeType(EdgeType.TREE)
+            .build();
+
+        EdgeRule rule = edgeIngestor.getRule(ruleQuery);
+
+               assertEquals("in direction", rule.getDirection(), Direction.OUT);
+       }
+
+       @Test
+       public void verifyMultipleGet() throws EdgeRuleNotFoundException {
+
+        EdgeRuleQuery ruleQuery = new EdgeRuleQuery
+            .Builder("model-element", "model-ver")
+            .edgeType(EdgeType.TREE)
+            .build();
+
+               Multimap<String, EdgeRule> ruleMap = edgeIngestor.getRules(ruleQuery);
+
+        for (EdgeRule edgeRule : ruleMap.get("model|model-ver")) {
+            assertEquals("has isA rule", "org.onap.relationships.inventory.IsA",
+                edgeRule.getLabel());
+        }
+
+       }
+
+    @Test
+    public void verifyAllRules() throws EdgeRuleNotFoundException {
+
+        // This will cause every rule in the real json files to be verified
+        // so if any required properties are missing, the verification builds
+        // will catch it and incorrect rules can't get merged in.
+        for (SchemaVersion v : schemaVersions.getVersions()) {
+            Multimap<String, EdgeRule> all = edgeIngestor.getAllRules(schemaVersions.getDefaultVersion());
+
+            //this part verifies the default properties
+            // 1) can have only at most 1 containment edge between same node type pair
+            // 2) if there is at least 1 cousin edge, there must be exactly 1 cousin edge with default=true
+            for (String key : all.keySet()) {
+
+                Collection<EdgeRule> edgeRuleCollection = all.get(key);
+
+                boolean foundContainment = false; //can have at most 1 containment rel btwn same pair of node types
+                boolean foundCousin = false;
+                boolean cousinDefault = false; //if there is a cousin edge there must be at least 1 default cousin defined
+                Set<String> labels = new HashSet<>(); //all edges between the same pair must have different labels
+                int cousinCount = 0;
+
+                for(EdgeRule rule: edgeRuleCollection){
+                    EdgeRule match = rule;
+                    //check containment
+                    if (!("NONE".equals(match.getContains()))) {
+                        if (foundContainment) {
+                            fail("more than one containment edge defined for " + v.toString() + " " + key);
+                        } else {
+                            foundContainment = true;
+                        }
+                    } else { //check cousin stuff
+                        foundCousin = true;
+                        cousinCount++;
+                        if (match.isDefault()) {
+                            if (!cousinDefault) {
+                                cousinDefault = true;
+                            } else {
+                                fail("more than one cousin edge defined as default for " + v.toString() + " " + key);
+                            }
+                        }
+                    }
+
+                    //check labels
+                    String label = match.getLabel();
+                    if (labels.contains(label)) {
+                        fail("same label found for multiple edges for " + v.toString() + " " + key);
+                    } else {
+                        labels.add(label);
+                    }
+                }
+                if (foundCousin && !cousinDefault && cousinCount > 1) {
+                    fail("there is at least one cousin edge but none are designated the default for " + v.toString() + " " + key);
+                }
+            }
+        }
+    }
+}

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd
index c303461..5dbe35b 100644 (file)
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd
@@ -113,14 +113,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="relationship-key" type="xs:string">
+        <xs:element name="relationship-key" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate an attribute.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="relationship-value" type="xs:string">
+        <xs:element name="relationship-value" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Value of the attribute.")</annox:annotate>
@@ -193,25 +193,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks",uriTemplate="/oam-networks/oam-network/{network-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks",uriTemplate="/oam-networks/oam-network/{network-uuid}",requiredProps="network-uuid,network-name,cvlan-tag")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="network-uuid" type="xs:string">
+        <xs:element name="network-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of the network. Unique across a cloud-region")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="network-name" type="xs:string">
+        <xs:element name="network-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the network.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
+        <xs:element name="cvlan-tag" type="xs:unsignedInt" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="cvlan-id")</annox:annotate>
@@ -259,18 +259,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches",uriTemplate="/dvs-switches/dvs-switch/{switch-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches",uriTemplate="/dvs-switches/dvs-switch/{switch-name}",requiredProps="switch-name,vcenter-url")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="switch-name" type="xs:string">
+        <xs:element name="switch-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="DVS switch name")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vcenter-url" type="xs:string">
+        <xs:element name="vcenter-url" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL used to reach the vcenter")</annox:annotate>
@@ -304,18 +304,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones",uriTemplate="/availability-zones/availability-zone/{availability-zone-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones",uriTemplate="/availability-zones/availability-zone/{availability-zone-name}",requiredProps="availability-zone-name,hypervisor-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="availability-zone-name" type="xs:string">
+        <xs:element name="availability-zone-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the availability zone.  Unique across a cloud region")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="hypervisor-type" type="xs:string">
+        <xs:element name="hypervisor-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of hypervisor.  Source of truth should define valid values.")</annox:annotate>
@@ -394,11 +394,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team.")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team.",requiredProps="update-node-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="update-node-type" type="xs:string"/>
+        <xs:element name="update-node-type" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:update-node-key" minOccurs="0" maxOccurs="5000"/>
         <xs:element name="update-node-uri" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:action" minOccurs="0" maxOccurs="5000"/>
@@ -416,7 +416,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
   <xs:element name="notify">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="event-id" type="xs:string"/>
+        <xs:element name="event-id" type="xs:string" minOccurs="0"/>
         <xs:element name="node-type" type="xs:string" minOccurs="0"/>
         <xs:element name="event-trigger" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:key-data" minOccurs="0" maxOccurs="5000"/>
@@ -441,25 +441,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools",uriTemplate="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools",uriTemplate="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}",requiredProps="target-pe,availability-zone-name,ctag-pool-purpose")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="target-pe" type="xs:string">
+        <xs:element name="target-pe" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="The Target provider edge router")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="availability-zone-name" type="xs:string">
+        <xs:element name="availability-zone-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the availability zone")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="ctag-pool-purpose" type="xs:string">
+        <xs:element name="ctag-pool-purpose" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Describes what the intended purpose of this pool is.")</annox:annotate>
@@ -495,11 +495,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/complexes/complex/{physical-location-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/complexes/complex/{physical-location-id}",requiredProps="physical-location-id,physical-location-type,street1,city,postal-code,country,region")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="physical-location-id" type="xs:string">
+        <xs:element name="physical-location-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier for physical location, e.g., CLLI")</annox:annotate>
@@ -534,20 +534,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="physical-location-type" type="xs:string">
+        <xs:element name="physical-location-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type, e.g., central office, data center.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="street1" type="xs:string"/>
+        <xs:element name="street1" type="xs:string" minOccurs="0"/>
         <xs:element name="street2" type="xs:string" minOccurs="0"/>
-        <xs:element name="city" type="xs:string"/>
+        <xs:element name="city" type="xs:string" minOccurs="0"/>
         <xs:element name="state" type="xs:string" minOccurs="0"/>
-        <xs:element name="postal-code" type="xs:string"/>
-        <xs:element name="country" type="xs:string"/>
-        <xs:element name="region" type="xs:string"/>
+        <xs:element name="postal-code" type="xs:string" minOccurs="0"/>
+        <xs:element name="country" type="xs:string" minOccurs="0"/>
+        <xs:element name="region" type="xs:string" minOccurs="0"/>
         <xs:element name="latitude" type="xs:string" minOccurs="0"/>
         <xs:element name="longitude" type="xs:string" minOccurs="0"/>
         <xs:element name="elevation" type="xs:string" minOccurs="0"/>
@@ -573,11 +573,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups",uriTemplate="/volume-groups/volume-group/{volume-group-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups",uriTemplate="/volume-groups/volume-group/{volume-group-id}",requiredProps="volume-group-id,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="volume-group-id" type="xs:string">
+        <xs:element name="volume-group-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of volume-group.")</annox:annotate>
@@ -598,7 +598,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -653,18 +653,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes",uriTemplate="/volumes/volume/{volume-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes",uriTemplate="/volumes/volume/{volume-id}",requiredProps="volume-id,volume-selflink")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="volume-id" type="xs:string">
+        <xs:element name="volume-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of block storage volume relative to the vserver.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="volume-selflink" type="xs:string">
+        <xs:element name="volume-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -698,11 +698,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface",uriTemplate="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface",uriTemplate="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}",requiredProps="l3-interface-ipv4-address")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="l3-interface-ipv4-address" type="xs:string">
+        <xs:element name="l3-interface-ipv4-address" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
@@ -766,11 +766,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface",uriTemplate="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface",uriTemplate="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}",requiredProps="l3-interface-ipv6-address")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="l3-interface-ipv6-address" type="xs:string">
+        <xs:element name="l3-interface-ipv6-address" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
@@ -834,11 +834,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans",uriTemplate="/vlans/vlan/{vlan-interface}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans",uriTemplate="/vlans/vlan/{vlan-interface}",requiredProps="vlan-interface,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vlan-interface" type="xs:string">
+        <xs:element name="vlan-interface" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="String that identifies the interface")</annox:annotate>
@@ -932,11 +932,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs",uriTemplate="/sriov-vfs/sriov-vf/{pci-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs",uriTemplate="/sriov-vfs/sriov-vf/{pci-id}",requiredProps="pci-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="pci-id" type="xs:string">
+        <xs:element name="pci-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="PCI ID used to identify the sriov-vf")</annox:annotate>
@@ -1054,11 +1054,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface",container="l-interfaces",uriTemplate="/l-interfaces/l-interface/{interface-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface",container="l-interfaces",uriTemplate="/l-interfaces/l-interface/{interface-name}",requiredProps="interface-name,is-port-mirrored,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
+        <xs:element name="interface-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name given to the interface")</annox:annotate>
@@ -1167,18 +1167,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers",uriTemplate="/vservers/vserver/{vserver-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers",uriTemplate="/vservers/vserver/{vserver-id}",requiredProps="vserver-id,vserver-name,vserver-selflink,in-maint,is-closed-loop-disabled")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vserver-id" type="xs:string">
+        <xs:element name="vserver-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier for this vserver relative to its tenant")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vserver-name" type="xs:string">
+        <xs:element name="vserver-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of vserver")</annox:annotate>
@@ -1199,7 +1199,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vserver-selflink" type="xs:string">
+        <xs:element name="vserver-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -1249,18 +1249,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants",uriTemplate="/tenants/tenant/{tenant-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants",uriTemplate="/tenants/tenant/{tenant-id}",requiredProps="tenant-id,tenant-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="tenant-id" type="xs:string">
+        <xs:element name="tenant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id relative to the cloud-region.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="tenant-name" type="xs:string">
+        <xs:element name="tenant-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Readable name of tenant")</annox:annotate>
@@ -1295,18 +1295,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors",uriTemplate="/flavors/flavor/{flavor-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors",uriTemplate="/flavors/flavor/{flavor-id}",requiredProps="flavor-id,flavor-name,flavor-selflink")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="flavor-id" type="xs:string">
+        <xs:element name="flavor-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Flavor id, expected to be unique across cloud-region.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="flavor-name" type="xs:string">
+        <xs:element name="flavor-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Flavor name")</annox:annotate>
@@ -1355,7 +1355,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="flavor-selflink" type="xs:string">
+        <xs:element name="flavor-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -1396,25 +1396,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments",uriTemplate="/group-assignments/group-assignment/{group-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments",uriTemplate="/group-assignments/group-assignment/{group-id}",requiredProps="group-id,group-type,group-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="group-id" type="xs:string">
+        <xs:element name="group-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Group id, expected to be unique across cloud-region.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="group-type" type="xs:string">
+        <xs:element name="group-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group type - the type of group this instance refers to")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="group-name" type="xs:string">
+        <xs:element name="group-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group name - name assigned to the group")</annox:annotate>
@@ -1455,11 +1455,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots",uriTemplate="/snapshots/snapshot/{snapshot-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots",uriTemplate="/snapshots/snapshot/{snapshot-id}",requiredProps="snapshot-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="snapshot-id" type="xs:string">
+        <xs:element name="snapshot-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Snapshot id, this is the key UUID assoc associated in glance with the snapshots.")</annox:annotate>
@@ -1556,18 +1556,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata",uriTemplate="/metadata/metadatum/{metaname}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata",uriTemplate="/metadata/metadatum/{metaname}",requiredProps="metaname,metaval")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="metaname" type="xs:string">
+        <xs:element name="metaname" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="metaval" type="xs:string"/>
+        <xs:element name="metaval" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -1594,18 +1594,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images",uriTemplate="/images/image/{image-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images",uriTemplate="/images/image/{image-id}",requiredProps="image-id,image-name,image-os-distro,image-os-version,image-selflink")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="image-id" type="xs:string">
+        <xs:element name="image-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Image id, expected to be unique across cloud region")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-name" type="xs:string">
+        <xs:element name="image-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Image name")</annox:annotate>
@@ -1619,14 +1619,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-os-distro" type="xs:string">
+        <xs:element name="image-os-distro" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-os-version" type="xs:string">
+        <xs:element name="image-os-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The operating system version as specified by the distributor.")</annox:annotate>
@@ -1654,7 +1654,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-selflink" type="xs:string">
+        <xs:element name="image-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -1701,18 +1701,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}",requiredProps="cloud-owner,cloud-region-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="cloud-owner" type="xs:string">
+        <xs:element name="cloud-owner" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="cloud-region-id" type="xs:string">
+        <xs:element name="cloud-region-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifier used by the vendor for the region. Second part of composite key")</annox:annotate>
@@ -1797,11 +1797,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}",requiredProps="nm-profile-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="nm-profile-name" type="xs:string">
+        <xs:element name="nm-profile-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique name of network profile.")</annox:annotate>
@@ -1842,11 +1842,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
+        <xs:element name="interface-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name that identifies the physical interface")</annox:annotate>
@@ -1937,11 +1937,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces",uriTemplate="/lag-interfaces/lag-interface/{interface-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces",uriTemplate="/lag-interfaces/lag-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
+        <xs:element name="interface-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name that identifies the link aggregate interface")</annox:annotate>
@@ -2025,11 +2025,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",uniqueProps="hostname",container="pservers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/pservers/pserver/{hostname}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",uniqueProps="hostname",container="pservers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/pservers/pserver/{hostname}",requiredProps="hostname,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="hostname" type="xs:string">
+        <xs:element name="hostname" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Value from executing hostname on the compute node.")</annox:annotate>
@@ -2226,18 +2226,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}",requiredProps="vdc-id,vdc-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vdc-id" type="xs:string">
+        <xs:element name="vdc-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vdc")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vdc-name" type="xs:string">
+        <xs:element name="vdc-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the virtual data center")</annox:annotate>
@@ -2287,11 +2287,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business",uriTemplate="/business/connectors/connector/{resource-instance-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business",uriTemplate="/business/connectors/connector/{resource-instance-id}",requiredProps="resource-instance-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="resource-instance-id" type="xs:string">
+        <xs:element name="resource-instance-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of resource instance.")</annox:annotate>
@@ -2361,39 +2361,39 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects",uriTemplate="/tunnel-xconnects/tunnel-xconnect/{id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects",uriTemplate="/tunnel-xconnects/tunnel-xconnect/{id}",requiredProps="id,bandwidth-up-wan1,bandwidth-down-wan1,bandwidth-up-wan2,bandwidth-down-wan2")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="id" type="xs:string">
+        <xs:element name="id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="bandwidth-up-wan1" type="xs:string">
+        <xs:element name="bandwidth-up-wan1" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The WAN uplink bandwidth for WAN1")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="bandwidth-down-wan1" type="xs:string">
+        <xs:element name="bandwidth-down-wan1" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The WAN downlink bandwidth for WAN1")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="bandwidth-up-wan2" type="xs:string">
+        <xs:element name="bandwidth-up-wan2" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The WAN uplink bandwidth for WAN2")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="bandwidth-down-wan2" type="xs:string">
+        <xs:element name="bandwidth-down-wan2" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The WAN downlink bandwidth for WAN2")</annox:annotate>
@@ -2427,11 +2427,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role",dependentOn="service-instance",container="allotted-resources",uriTemplate="/allotted-resources/allotted-resource/{id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role",dependentOn="service-instance",container="allotted-resources",uriTemplate="/allotted-resources/allotted-resource/{id}",requiredProps="id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="id" type="xs:string">
+        <xs:element name="id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
@@ -2529,11 +2529,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}",requiredProps="service-instance-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-instance-id" type="xs:string">
+        <xs:element name="service-instance-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this instance of a service")</annox:annotate>
@@ -2674,11 +2674,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type",uriTemplate="/service-subscriptions/service-subscription/{service-type}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type",uriTemplate="/service-subscriptions/service-subscription/{service-type}",requiredProps="service-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
+        <xs:element name="service-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Value defined by orchestration to identify this service across ECOMP.")</annox:annotate>
@@ -2720,25 +2720,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business",uriTemplate="/business/customers/customer/{global-customer-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business",uriTemplate="/business/customers/customer/{global-customer-id}",requiredProps="global-customer-id,subscriber-name,subscriber-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="global-customer-id" type="xs:string">
+        <xs:element name="global-customer-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Global customer id used across ECOMP to uniquely identify customer.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="subscriber-name" type="xs:string">
+        <xs:element name="subscriber-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Subscriber name, an alternate way to retrieve a customer.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="subscriber-type" type="xs:string">
+        <xs:element name="subscriber-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Subscriber type, a way to provide VID with only the INFRA customers.",defaultValue="CUST")</annox:annotate>
@@ -2786,25 +2786,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/vnf-images/vnf-image/{att-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/vnf-images/vnf-image/{att-uuid}",requiredProps="vnf-image-uuid,application,application-vendor")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-image-uuid" type="xs:string">
+        <xs:element name="vnf-image-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of this asset")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="application" type="xs:string">
+        <xs:element name="application" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="application-vendor" type="xs:string">
+        <xs:element name="application-vendor" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
@@ -2852,18 +2852,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/services/service/{service-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/services/service/{service-id}",requiredProps="service-id,service-description")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-id" type="xs:string">
+        <xs:element name="service-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="service-description" type="xs:string">
+        <xs:element name="service-description" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Description of the service")</annox:annotate>
@@ -2911,18 +2911,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}",requiredProps="service-type,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
+        <xs:element name="service-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -2956,18 +2956,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets",uriTemplate="/element-choice-sets/element-choice-set/{element-choice-set-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets",uriTemplate="/element-choice-sets/element-choice-set/{element-choice-set-uuid}",requiredProps="element-choice-set-uuid,element-choice-set-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="element-choice-set-uuid" type="xs:string">
+        <xs:element name="element-choice-set-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="element-choice-set-name" type="xs:string"/>
+        <xs:element name="element-choice-set-name" type="xs:string" minOccurs="0"/>
         <xs:element name="cardinality" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:model-elements" minOccurs="0"/>
@@ -2986,19 +2986,19 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets",uriTemplate="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets",uriTemplate="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}",requiredProps="constrained-element-set-uuid,constraint-type,check-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="constrained-element-set-uuid" type="xs:string">
+        <xs:element name="constrained-element-set-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="check-type" type="xs:string"/>
+        <xs:element name="constraint-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="check-type" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:element-choice-sets" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -3016,18 +3016,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints",uriTemplate="/model-constraints/model-constraint/{model-constraint-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints",uriTemplate="/model-constraints/model-constraint/{model-constraint-uuid}",requiredProps="model-constraint-uuid,constrained-element-set-uuid-to-replace")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-constraint-uuid" type="xs:string">
+        <xs:element name="model-constraint-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string"/>
+        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:constrained-element-sets" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
@@ -3050,25 +3050,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements",uriTemplate="/model-elements/model-element/{model-element-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements",uriTemplate="/model-elements/model-element/{model-element-uuid}",requiredProps="model-element-uuid,new-data-del-flag,cardinality")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-element-uuid" type="xs:string">
+        <xs:element name="model-element-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="new-data-del-flag" type="xs:string">
+        <xs:element name="new-data-del-flag" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates whether this element was created as part of instantiation from this model")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="cardinality" type="xs:string">
+        <xs:element name="cardinality" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="How many of this type of element are required/allowed")</annox:annotate>
@@ -3112,25 +3112,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version",uniqueProps="model-version-id",container="model-vers",uriTemplate="/model-vers/model-ver/{model-version-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version",uniqueProps="model-version-id",container="model-vers",uriTemplate="/model-vers/model-ver/{model-version-id}",requiredProps="model-version-id,model-name,model-version")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-version-id" type="xs:string">
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-name" type="xs:string">
+        <xs:element name="model-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-version" type="xs:string">
+        <xs:element name="model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate>
@@ -3168,18 +3168,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/models/model/{model-invariant-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/models/model/{model-invariant-id}",requiredProps="model-invariant-id,model-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string">
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-type" type="xs:string">
+        <xs:element name="model-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>
@@ -3214,21 +3214,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups",uriTemplate="/related-lookups/related-lookup/{related-lookup-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups",uriTemplate="/related-lookups/related-lookup/{related-lookup-uuid}",requiredProps="related-lookup-uuid,source-node-type,source-node-property,target-node-type,target-node-property")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="related-lookup-uuid" type="xs:string">
+        <xs:element name="related-lookup-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="source-node-type" type="xs:string"/>
-        <xs:element name="source-node-property" type="xs:string"/>
-        <xs:element name="target-node-type" type="xs:string"/>
-        <xs:element name="target-node-property" type="xs:string"/>
+        <xs:element name="source-node-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="source-node-property" type="xs:string" minOccurs="0"/>
+        <xs:element name="target-node-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="target-node-property" type="xs:string" minOccurs="0"/>
         <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="5000"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -3246,20 +3246,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints",uriTemplate="/property-constraints/property-constraint/{property-constraint-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints",uriTemplate="/property-constraints/property-constraint/{property-constraint-uuid}",requiredProps="property-constraint-uuid,constraint-type,property-name,property-value")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="property-constraint-uuid" type="xs:string">
+        <xs:element name="property-constraint-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="property-name" type="xs:string"/>
-        <xs:element name="property-value" type="xs:string"/>
+        <xs:element name="constraint-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
@@ -3275,11 +3275,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements",uriTemplate="/named-query-elements/named-query-element/{named-query-element-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements",uriTemplate="/named-query-elements/named-query-element/{named-query-element-uuid}",requiredProps="named-query-element-uuid")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="named-query-element-uuid" type="xs:string">
+        <xs:element name="named-query-element-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
@@ -3308,19 +3308,19 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/named-queries/named-query/{named-query-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/named-queries/named-query/{named-query-uuid}",requiredProps="named-query-uuid,named-query-name,named-query-version")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="named-query-uuid" type="xs:string">
+        <xs:element name="named-query-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="named-query-name" type="xs:string"/>
-        <xs:element name="named-query-version" type="xs:string"/>
+        <xs:element name="named-query-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="named-query-version" type="xs:string" minOccurs="0"/>
         <xs:element name="required-input-params" minOccurs="0">
           <xs:complexType>
             <xs:sequence>
@@ -3362,18 +3362,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",uriTemplate="/network/logical-links/logical-link/{link-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",uriTemplate="/network/logical-links/logical-link/{link-name}",requiredProps="link-name,link-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
+        <xs:element name="link-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="link-type" type="xs:string">
+        <xs:element name="link-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of logical link, e.g., evc")</annox:annotate>
@@ -3523,7 +3523,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="cos" type="xs:string">
+        <xs:element name="cos" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
@@ -3575,7 +3575,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="site-pair-id" type="xs:string">
+        <xs:element name="site-pair-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
@@ -3649,7 +3649,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="routing-instance-id" type="xs:string">
+        <xs:element name="routing-instance-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of routing instance")</annox:annotate>
@@ -3691,11 +3691,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network",uriTemplate="/network/site-pair-sets/site-pair-set/{site-pair-set-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network",uriTemplate="/network/site-pair-sets/site-pair-set/{site-pair-set-id}",requiredProps="site-pair-set-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="site-pair-set-id" type="xs:string">
+        <xs:element name="site-pair-set-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of site pair set.")</annox:annotate>
@@ -3730,18 +3730,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true",uriTemplate="/route-targets/route-target/{global-route-target}/{route-target-role}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true",uriTemplate="/route-targets/route-target/{global-route-target}/{route-target-role}",requiredProps="global-route-target,route-target-role")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="global-route-target" type="xs:string">
+        <xs:element name="global-route-target" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Number used to identify an RT, globally unique in the network")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="route-target-role" type="xs:string">
+        <xs:element name="route-target-role" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Role assigned to this route target")</annox:annotate>
@@ -3775,18 +3775,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}",requiredProps="vpn-id,vpn-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vpn-id" type="xs:string">
+        <xs:element name="vpn-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="VPN ID, globally unique within A&amp;AI")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vpn-name" type="xs:string">
+        <xs:element name="vpn-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VPN Name")</annox:annotate>
@@ -3843,11 +3843,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network",uriTemplate="/network/vpls-pes/vpls-pe/{equipment-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network",uriTemplate="/network/vpls-pes/vpls-pe/{equipment-name}",requiredProps="equipment-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="equipment-name" type="xs:string">
+        <xs:element name="equipment-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
@@ -3915,21 +3915,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="multicast-configuration-id" type="xs:string">
+        <xs:element name="multicast-configuration-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of multicast configuration.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="multicast-protocol" type="xs:string">
+        <xs:element name="multicast-protocol" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="protocol of multicast configuration")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="rp-type" type="xs:string">
+        <xs:element name="rp-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="rp type of multicast configuration")</annox:annotate>
@@ -3967,7 +3967,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
+        <xs:element name="cvlan-tag" type="xs:unsignedInt" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="See mis-na-virtualization-platform.yang")</annox:annotate>
@@ -3996,11 +3996,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-id" type="xs:string">
+        <xs:element name="interface-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the interface")</annox:annotate>
@@ -4056,7 +4056,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="orchestration-status" type="xs:string">
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
@@ -4093,18 +4093,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}",requiredProps="group-uuid,resource-uuid")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
+        <xs:element name="group-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the license group the resource belongs to, should be uuid.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
+        <xs:element name="resource-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of a license resource. ")</annox:annotate>
@@ -4138,18 +4138,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements",uriTemplate="/entitlements/entitlement/{group-uuid}/{resource-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements",uriTemplate="/entitlements/entitlement/{group-uuid}/{resource-uuid}",requiredProps="group-uuid,resource-uuid")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
+        <xs:element name="group-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the entitlement group the resource comes from, should be uuid.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
+        <xs:element name="resource-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of an entitlement resource. ")</annox:annotate>
@@ -4183,18 +4183,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
@@ -4208,7 +4208,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -4347,21 +4347,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnfc-name" type="xs:string">
+        <xs:element name="vnfc-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of vnfc.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnfc-function-code" type="xs:string">
+        <xs:element name="vnfc-function-code" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="function code",dbAlias="nfc-naming-code")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnfc-type" type="xs:string">
+        <xs:element name="vnfc-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="type",dbAlias="nfc-function")</annox:annotate>
@@ -4441,7 +4441,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="subnet-id" type="xs:string">
+        <xs:element name="subnet-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Subnet ID, should be UUID.")</annox:annotate>
@@ -4544,7 +4544,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt">
+        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="id.")</annox:annotate>
@@ -4573,11 +4573,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments",uriTemplate="/segmentation-assignments/segmentation-assignment/{segmentation-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments",uriTemplate="/segmentation-assignments/segmentation-assignment/{segmentation-id}",requiredProps="segmentation-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="segmentation-id" type="xs:string">
+        <xs:element name="segmentation-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
@@ -4611,11 +4611,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="network-id" type="xs:string">
+        <xs:element name="network-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Network ID, should be uuid. Unique across A&amp;AI.")</annox:annotate>
@@ -4825,7 +4825,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="network-policy-id" type="xs:string">
+        <xs:element name="network-policy-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID representing unique key to this instance")</annox:annotate>
@@ -4868,11 +4868,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules",uriTemplate="/vf-modules/vf-module/{vf-module-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules",uriTemplate="/vf-modules/vf-module/{vf-module-id}",requiredProps="vf-module-id,is-base-vf-module")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vf-module-id" type="xs:string">
+        <xs:element name="vf-module-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of vf-module.")</annox:annotate>
@@ -4997,11 +4997,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs",uriTemplate="/network/generic-vnfs/generic-vnf/{vnf-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs",uriTemplate="/network/generic-vnfs/generic-vnf/{vnf-id}",requiredProps="vnf-id,vnf-type,in-maint,is-closed-loop-disabled")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
@@ -5022,7 +5022,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -5348,11 +5348,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network",uriTemplate="/network/lag-links/lag-link/{link-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network",uriTemplate="/network/lag-links/lag-link/{link-name}",requiredProps="link-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
+        <xs:element name="link-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Alphabetical concatenation of lag-interface names")</annox:annotate>
@@ -5386,18 +5386,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network",uriTemplate="/network/newvces/newvce/{vnf-id2}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network",uriTemplate="/network/newvces/newvce/{vnf-id2}",requiredProps="vnf-id2,vnf-name,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id2" type="xs:string">
+        <xs:element name="vnf-id2" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF, can't use same attribute name right now until we promote this new object")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
@@ -5411,7 +5411,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -5509,11 +5509,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="pnf-name" type="xs:string">
+        <xs:element name="pnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique name of Physical Network Function.")</annox:annotate>
@@ -5689,11 +5689,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id",uriTemplate="/network/physical-links/physical-link/{link-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id",uriTemplate="/network/physical-links/physical-link/{link-name}",requiredProps="link-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
+        <xs:element name="link-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ")</annox:annotate>
@@ -5769,11 +5769,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers",uriTemplate="/vig-servers/vig-server/{vig-address-type}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers",uriTemplate="/vig-servers/vig-server/{vig-address-type}",requiredProps="vig-address-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vig-address-type" type="xs:string">
+        <xs:element name="vig-address-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="indicates whether the VIG is for AVPN or INTERNET")</annox:annotate>
@@ -5816,11 +5816,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network",uriTemplate="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network",uriTemplate="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}",requiredProps="ipsec-configuration-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="ipsec-configuration-id" type="xs:string">
+        <xs:element name="ipsec-configuration-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of this configuration")</annox:annotate>
@@ -5990,18 +5990,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network",uriTemplate="/network/route-table-references/route-table-reference/{route-table-reference-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network",uriTemplate="/network/route-table-references/route-table-reference/{route-table-reference-id}",requiredProps="route-table-reference-id,route-table-reference-fqdn")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="route-table-reference-id" type="xs:string">
+        <xs:element name="route-table-reference-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="route-table-reference-fqdn" type="xs:string">
+        <xs:element name="route-table-reference-fqdn" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="FQDN entry in the route table.")</annox:annotate>
@@ -6035,25 +6035,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,description,type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="id" type="xs:string">
+        <xs:element name="id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Instance Group ID, UUID assigned to this instance.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="description" type="xs:string">
+        <xs:element name="description" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Descriptive text to help identify the usage of this instance-group")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="type" type="xs:string">
+        <xs:element name="type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability",dbAlias="instance-group-type")</annox:annotate>
@@ -6094,32 +6094,32 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network",uriTemplate="/network/zones/zone/{zone-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network",uriTemplate="/network/zones/zone/{zone-id}",requiredProps="zone-id,zone-name,design-type,zone-context")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="zone-id" type="xs:string">
+        <xs:element name="zone-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Code assigned by AIC to the zone")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="zone-name" type="xs:string">
+        <xs:element name="zone-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="English name associated with the zone")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="design-type" type="xs:string">
+        <xs:element name="design-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Design of zone [Medium/Large…]")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="zone-context" type="xs:string">
+        <xs:element name="zone-context" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Context of zone [production/test]")</annox:annotate>
@@ -6260,46 +6260,46 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models",requiredProps="model-invariant-id,model-name-version-id,model-type,model-name,model-id,model-version")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string">
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-name-version-id" type="xs:string">
+        <xs:element name="model-name-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-type" type="xs:string">
+        <xs:element name="model-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-name" type="xs:string">
+        <xs:element name="model-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-id" type="xs:string">
+        <xs:element name="model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-version" type="xs:string">
+        <xs:element name="model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate>
@@ -6463,11 +6463,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true",requiredProps="vnf-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd
index 4b97632..0a10746 100644 (file)
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd
@@ -113,14 +113,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="relationship-key" type="xs:string">
+        <xs:element name="relationship-key" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate an attribute.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="relationship-value" type="xs:string">
+        <xs:element name="relationship-value" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Value of the attribute.")</annox:annotate>
@@ -193,25 +193,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks",uriTemplate="/oam-networks/oam-network/{network-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks",uriTemplate="/oam-networks/oam-network/{network-uuid}",requiredProps="network-uuid,network-name,cvlan-tag")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="network-uuid" type="xs:string">
+        <xs:element name="network-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of the network. Unique across a cloud-region")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="network-name" type="xs:string">
+        <xs:element name="network-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the network.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
+        <xs:element name="cvlan-tag" type="xs:unsignedInt" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="cvlan-id")</annox:annotate>
@@ -259,18 +259,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches",uriTemplate="/dvs-switches/dvs-switch/{switch-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches",uriTemplate="/dvs-switches/dvs-switch/{switch-name}",requiredProps="switch-name,vcenter-url")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="switch-name" type="xs:string">
+        <xs:element name="switch-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="DVS switch name")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vcenter-url" type="xs:string">
+        <xs:element name="vcenter-url" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL used to reach the vcenter")</annox:annotate>
@@ -304,18 +304,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones",uriTemplate="/availability-zones/availability-zone/{availability-zone-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones",uriTemplate="/availability-zones/availability-zone/{availability-zone-name}",requiredProps="availability-zone-name,hypervisor-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="availability-zone-name" type="xs:string">
+        <xs:element name="availability-zone-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the availability zone.  Unique across a cloud region")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="hypervisor-type" type="xs:string">
+        <xs:element name="hypervisor-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of hypervisor.  Source of truth should define valid values.")</annox:annotate>
@@ -394,11 +394,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team.")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team.",requiredProps="update-node-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="update-node-type" type="xs:string"/>
+        <xs:element name="update-node-type" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:update-node-key" minOccurs="0" maxOccurs="5000"/>
         <xs:element name="update-node-uri" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:action" minOccurs="0" maxOccurs="5000"/>
@@ -416,7 +416,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
   <xs:element name="notify">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="event-id" type="xs:string"/>
+        <xs:element name="event-id" type="xs:string" minOccurs="0"/>
         <xs:element name="node-type" type="xs:string" minOccurs="0"/>
         <xs:element name="event-trigger" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:key-data" minOccurs="0" maxOccurs="5000"/>
@@ -441,25 +441,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools",uriTemplate="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools",uriTemplate="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}",requiredProps="target-pe,availability-zone-name,ctag-pool-purpose")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="target-pe" type="xs:string">
+        <xs:element name="target-pe" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="The Target provider edge router")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="availability-zone-name" type="xs:string">
+        <xs:element name="availability-zone-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the availability zone")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="ctag-pool-purpose" type="xs:string">
+        <xs:element name="ctag-pool-purpose" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Describes what the intended purpose of this pool is.")</annox:annotate>
@@ -495,11 +495,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/complexes/complex/{physical-location-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/complexes/complex/{physical-location-id}",requiredProps="physical-location-id,physical-location-type,street1,city,postal-code,country,region")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="physical-location-id" type="xs:string">
+        <xs:element name="physical-location-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier for physical location, e.g., CLLI")</annox:annotate>
@@ -534,20 +534,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="physical-location-type" type="xs:string">
+        <xs:element name="physical-location-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type, e.g., central office, data center.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="street1" type="xs:string"/>
+        <xs:element name="street1" type="xs:string" minOccurs="0"/>
         <xs:element name="street2" type="xs:string" minOccurs="0"/>
-        <xs:element name="city" type="xs:string"/>
+        <xs:element name="city" type="xs:string" minOccurs="0"/>
         <xs:element name="state" type="xs:string" minOccurs="0"/>
-        <xs:element name="postal-code" type="xs:string"/>
-        <xs:element name="country" type="xs:string"/>
-        <xs:element name="region" type="xs:string"/>
+        <xs:element name="postal-code" type="xs:string" minOccurs="0"/>
+        <xs:element name="country" type="xs:string" minOccurs="0"/>
+        <xs:element name="region" type="xs:string" minOccurs="0"/>
         <xs:element name="latitude" type="xs:string" minOccurs="0"/>
         <xs:element name="longitude" type="xs:string" minOccurs="0"/>
         <xs:element name="elevation" type="xs:string" minOccurs="0"/>
@@ -573,11 +573,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups",uriTemplate="/volume-groups/volume-group/{volume-group-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups",uriTemplate="/volume-groups/volume-group/{volume-group-id}",requiredProps="volume-group-id,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="volume-group-id" type="xs:string">
+        <xs:element name="volume-group-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of volume-group.")</annox:annotate>
@@ -598,7 +598,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -653,18 +653,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes",uriTemplate="/volumes/volume/{volume-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes",uriTemplate="/volumes/volume/{volume-id}",requiredProps="volume-id,volume-selflink")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="volume-id" type="xs:string">
+        <xs:element name="volume-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of block storage volume relative to the vserver.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="volume-selflink" type="xs:string">
+        <xs:element name="volume-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -698,11 +698,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc",uriTemplate="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc",uriTemplate="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}",requiredProps="l3-interface-ipv4-address")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="l3-interface-ipv4-address" type="xs:string">
+        <xs:element name="l3-interface-ipv4-address" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
@@ -766,11 +766,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc",uriTemplate="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc",uriTemplate="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}",requiredProps="l3-interface-ipv6-address")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="l3-interface-ipv6-address" type="xs:string">
+        <xs:element name="l3-interface-ipv6-address" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
@@ -834,11 +834,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans",uriTemplate="/vlans/vlan/{vlan-interface}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans",uriTemplate="/vlans/vlan/{vlan-interface}",requiredProps="vlan-interface,in-maint,is-ip-unnumbered")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vlan-interface" type="xs:string">
+        <xs:element name="vlan-interface" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="String that identifies the interface")</annox:annotate>
@@ -946,11 +946,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs",uriTemplate="/sriov-vfs/sriov-vf/{pci-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs",uriTemplate="/sriov-vfs/sriov-vf/{pci-id}",requiredProps="pci-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="pci-id" type="xs:string">
+        <xs:element name="pci-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="PCI ID used to identify the sriov-vf")</annox:annotate>
@@ -1068,11 +1068,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface",container="l-interfaces",uriTemplate="/l-interfaces/l-interface/{interface-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface",container="l-interfaces",uriTemplate="/l-interfaces/l-interface/{interface-name}",requiredProps="interface-name,is-port-mirrored,in-maint,is-ip-unnumbered")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
+        <xs:element name="interface-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name given to the interface")</annox:annotate>
@@ -1202,18 +1202,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers",uriTemplate="/vservers/vserver/{vserver-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers",uriTemplate="/vservers/vserver/{vserver-id}",requiredProps="vserver-id,vserver-name,vserver-selflink,in-maint,is-closed-loop-disabled")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vserver-id" type="xs:string">
+        <xs:element name="vserver-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier for this vserver relative to its tenant")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vserver-name" type="xs:string">
+        <xs:element name="vserver-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of vserver")</annox:annotate>
@@ -1234,7 +1234,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vserver-selflink" type="xs:string">
+        <xs:element name="vserver-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -1284,18 +1284,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id,tenant-context",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants",uriTemplate="/tenants/tenant/{tenant-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id,tenant-context",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants",uriTemplate="/tenants/tenant/{tenant-id}",requiredProps="tenant-id,tenant-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="tenant-id" type="xs:string">
+        <xs:element name="tenant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id relative to the cloud-region.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="tenant-name" type="xs:string">
+        <xs:element name="tenant-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Readable name of tenant")</annox:annotate>
@@ -1337,18 +1337,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors",uriTemplate="/flavors/flavor/{flavor-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors",uriTemplate="/flavors/flavor/{flavor-id}",requiredProps="flavor-id,flavor-name,flavor-selflink")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="flavor-id" type="xs:string">
+        <xs:element name="flavor-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Flavor id, expected to be unique across cloud-region.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="flavor-name" type="xs:string">
+        <xs:element name="flavor-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Flavor name")</annox:annotate>
@@ -1397,7 +1397,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="flavor-selflink" type="xs:string">
+        <xs:element name="flavor-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -1438,25 +1438,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments",uriTemplate="/group-assignments/group-assignment/{group-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments",uriTemplate="/group-assignments/group-assignment/{group-id}",requiredProps="group-id,group-type,group-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="group-id" type="xs:string">
+        <xs:element name="group-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Group id, expected to be unique across cloud-region.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="group-type" type="xs:string">
+        <xs:element name="group-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group type - the type of group this instance refers to")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="group-name" type="xs:string">
+        <xs:element name="group-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group name - name assigned to the group")</annox:annotate>
@@ -1497,11 +1497,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots",uriTemplate="/snapshots/snapshot/{snapshot-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots",uriTemplate="/snapshots/snapshot/{snapshot-id}",requiredProps="snapshot-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="snapshot-id" type="xs:string">
+        <xs:element name="snapshot-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Snapshot id, this is the key UUID assoc associated in glance with the snapshots.")</annox:annotate>
@@ -1598,18 +1598,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata",uriTemplate="/metadata/metadatum/{metaname}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata",uriTemplate="/metadata/metadatum/{metaname}",requiredProps="metaname,metaval")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="metaname" type="xs:string">
+        <xs:element name="metaname" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="metaval" type="xs:string"/>
+        <xs:element name="metaval" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -1636,18 +1636,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images",uriTemplate="/images/image/{image-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images",uriTemplate="/images/image/{image-id}",requiredProps="image-id,image-name,image-os-distro,image-os-version,image-selflink")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="image-id" type="xs:string">
+        <xs:element name="image-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Image id, expected to be unique across cloud region")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-name" type="xs:string">
+        <xs:element name="image-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Image name")</annox:annotate>
@@ -1661,14 +1661,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-os-distro" type="xs:string">
+        <xs:element name="image-os-distro" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-os-version" type="xs:string">
+        <xs:element name="image-os-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The operating system version as specified by the distributor.")</annox:annotate>
@@ -1696,7 +1696,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-selflink" type="xs:string">
+        <xs:element name="image-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -1743,11 +1743,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist common address information of external systems.",indexedProps="esr-system-info-id,system-name,system-type",searchable="esr-system-info-id,system-name,system-type",container="esr-system-info-list",dependentOn="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist common address information of external systems.",indexedProps="esr-system-info-id,system-name,system-type",searchable="esr-system-info-id,system-name,system-type",container="esr-system-info-list",dependentOn="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc",requiredProps="esr-system-info-id,user-name,password,system-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="esr-system-info-id" type="xs:string">
+        <xs:element name="esr-system-info-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of esr system info.")</annox:annotate>
@@ -1789,21 +1789,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="user-name" type="xs:string">
+        <xs:element name="user-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="username used to access external systems.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="password" type="xs:string">
+        <xs:element name="password" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="password used to access external systems.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="system-type" type="xs:string">
+        <xs:element name="system-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="it could be vim/vnfm/thirdparty-sdnc/ems-resource/ems-performance/ems-alarm.")</annox:annotate>
@@ -1907,11 +1907,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv4-address-list/{vip-ipv4-address}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv4-address-list/{vip-ipv4-address}",requiredProps="vip-ipv4-address")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vip-ipv4-address" type="xs:string">
+        <xs:element name="vip-ipv4-address" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
@@ -1975,11 +1975,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv6-address-list/{vip-ipv6-address}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv6-address-list/{vip-ipv6-address}",requiredProps="vip-ipv6-address")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vip-ipv6-address" type="xs:string">
+        <xs:element name="vip-ipv6-address" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
@@ -2043,18 +2043,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}",requiredProps="cloud-owner,cloud-region-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="cloud-owner" type="xs:string">
+        <xs:element name="cloud-owner" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="cloud-region-id" type="xs:string">
+        <xs:element name="cloud-region-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifier used by the vendor for the region. Second part of composite key")</annox:annotate>
@@ -2163,11 +2163,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}",requiredProps="nm-profile-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="nm-profile-name" type="xs:string">
+        <xs:element name="nm-profile-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique name of network profile.")</annox:annotate>
@@ -2208,11 +2208,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Physical Function",indexedProps="pf-pci-id",dependentOn="p-interface",container="sriov-pfs",uriTemplate="/sriov-pfs/sriov-pf/{pf-pci-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Physical Function",indexedProps="pf-pci-id",dependentOn="p-interface",container="sriov-pfs",uriTemplate="/sriov-pfs/sriov-pf/{pf-pci-id}",requiredProps="pf-pci-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="pf-pci-id" type="xs:string">
+        <xs:element name="pf-pci-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifier for the sriov-pf")</annox:annotate>
@@ -2246,11 +2246,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
+        <xs:element name="interface-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name that identifies the physical interface")</annox:annotate>
@@ -2356,11 +2356,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces",uriTemplate="/lag-interfaces/lag-interface/{interface-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces",uriTemplate="/lag-interfaces/lag-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
+        <xs:element name="interface-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name that identifies the link aggregate interface")</annox:annotate>
@@ -2444,11 +2444,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",uniqueProps="hostname",container="pservers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/pservers/pserver/{hostname}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",uniqueProps="hostname",container="pservers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/pservers/pserver/{hostname}",requiredProps="hostname,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="hostname" type="xs:string">
+        <xs:element name="hostname" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Value from executing hostname on the compute node.")</annox:annotate>
@@ -2659,18 +2659,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}",requiredProps="vdc-id,vdc-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vdc-id" type="xs:string">
+        <xs:element name="vdc-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vdc")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vdc-name" type="xs:string">
+        <xs:element name="vdc-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the virtual data center")</annox:annotate>
@@ -2720,11 +2720,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist EMS address information used by EMS driver.",indexedProps="ems-id",searchable="ems-id",container="esr-ems-list",namespace="external-system")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist EMS address information used by EMS driver.",indexedProps="ems-id",searchable="ems-id",container="esr-ems-list",namespace="external-system",requiredProps="ems-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="ems-id" type="xs:string">
+        <xs:element name="ems-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of EMS.")</annox:annotate>
@@ -2759,11 +2759,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist VNFM address information used by VF-C.",indexedProps="vnfm-id",searchable="vnfm-id",container="esr-vnfm-list",namespace="external-system")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist VNFM address information used by VF-C.",indexedProps="vnfm-id",searchable="vnfm-id",container="esr-vnfm-list",namespace="external-system",requiredProps="vnfm-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnfm-id" type="xs:string">
+        <xs:element name="vnfm-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of VNFM.")</annox:annotate>
@@ -2812,11 +2812,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="thirdparty-sdnc-id" type="xs:string">
+        <xs:element name="thirdparty-sdnc-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of SDNC.")</annox:annotate>
@@ -2879,11 +2879,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business",uriTemplate="/business/connectors/connector/{resource-instance-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business",uriTemplate="/business/connectors/connector/{resource-instance-id}",requiredProps="resource-instance-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="resource-instance-id" type="xs:string">
+        <xs:element name="resource-instance-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of resource instance.")</annox:annotate>
@@ -2953,11 +2953,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects",uriTemplate="/tunnel-xconnects/tunnel-xconnect/{id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects",uriTemplate="/tunnel-xconnects/tunnel-xconnect/{id}",requiredProps="id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="id" type="xs:string">
+        <xs:element name="id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
@@ -3019,11 +3019,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role",dependentOn="service-instance",container="allotted-resources",uriTemplate="/allotted-resources/allotted-resource/{id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role",dependentOn="service-instance",container="allotted-resources",uriTemplate="/allotted-resources/allotted-resource/{id}",requiredProps="id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="id" type="xs:string">
+        <xs:element name="id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
@@ -3121,11 +3121,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}",requiredProps="service-instance-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-instance-id" type="xs:string">
+        <xs:element name="service-instance-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this instance of a service")</annox:annotate>
@@ -3315,11 +3315,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type",uriTemplate="/service-subscriptions/service-subscription/{service-type}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type",uriTemplate="/service-subscriptions/service-subscription/{service-type}",requiredProps="service-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
+        <xs:element name="service-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Value defined by orchestration to identify this service across ECOMP.")</annox:annotate>
@@ -3361,25 +3361,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business",uriTemplate="/business/customers/customer/{global-customer-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business",uriTemplate="/business/customers/customer/{global-customer-id}",requiredProps="global-customer-id,subscriber-name,subscriber-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="global-customer-id" type="xs:string">
+        <xs:element name="global-customer-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Global customer id used across ECOMP to uniquely identify customer.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="subscriber-name" type="xs:string">
+        <xs:element name="subscriber-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Subscriber name, an alternate way to retrieve a customer.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="subscriber-type" type="xs:string">
+        <xs:element name="subscriber-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Subscriber type, a way to provide VID with only the INFRA customers.",defaultValue="CUST")</annox:annotate>
@@ -3414,11 +3414,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a line-of-business",indexedProps="line-of-business-name",uniqueProps="line-of-business-name",container="lines-of-business",namespace="business",uriTemplate="/business/lines-of-business/line-of-business/{line-of-business-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a line-of-business",indexedProps="line-of-business-name",uniqueProps="line-of-business-name",container="lines-of-business",namespace="business",uriTemplate="/business/lines-of-business/line-of-business/{line-of-business-name}",requiredProps="line-of-business-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="line-of-business-name" type="xs:string">
+        <xs:element name="line-of-business-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the line-of-business (product)")</annox:annotate>
@@ -3452,18 +3452,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes an owning-entity",indexedProps="owning-entity-id,owning-entity-name",searchable="owning-entity-id",uniqueProps="owning-entity-id,owning-entity-name",container="owning-entities",namespace="business",uriTemplate="/business/owning-entities/owning-entity/{owning-entity-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes an owning-entity",indexedProps="owning-entity-id,owning-entity-name",searchable="owning-entity-id",uniqueProps="owning-entity-id,owning-entity-name",container="owning-entities",namespace="business",uriTemplate="/business/owning-entities/owning-entity/{owning-entity-id}",requiredProps="owning-entity-id,owning-entity-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="owning-entity-id" type="xs:string">
+        <xs:element name="owning-entity-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of an owning entity")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="owning-entity-name" type="xs:string">
+        <xs:element name="owning-entity-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Owning entity name")</annox:annotate>
@@ -3497,11 +3497,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a platform",indexedProps="platform-name",uniqueProps="platform-name",container="platforms",namespace="business",uriTemplate="/business/platforms/platform/{platform-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a platform",indexedProps="platform-name",uniqueProps="platform-name",container="platforms",namespace="business",uriTemplate="/business/platforms/platform/{platform-name}",requiredProps="platform-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="platform-name" type="xs:string">
+        <xs:element name="platform-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the platform")</annox:annotate>
@@ -3535,11 +3535,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes the project",indexedProps="project-name",uniqueProps="project-name",container="projects",namespace="business",uriTemplate="/business/projects/project/{project-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes the project",indexedProps="project-name",uniqueProps="project-name",container="projects",namespace="business",uriTemplate="/business/projects/project/{project-name}",requiredProps="project-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="project-name" type="xs:string">
+        <xs:element name="project-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the project deploying a service")</annox:annotate>
@@ -3590,25 +3590,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}",requiredProps="vnf-image-uuid,application,application-vendor")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-image-uuid" type="xs:string">
+        <xs:element name="vnf-image-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of this asset")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="application" type="xs:string">
+        <xs:element name="application" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="application-vendor" type="xs:string">
+        <xs:element name="application-vendor" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
@@ -3656,18 +3656,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/services/service/{service-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/services/service/{service-id}",requiredProps="service-id,service-description")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-id" type="xs:string">
+        <xs:element name="service-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="service-description" type="xs:string">
+        <xs:element name="service-description" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Description of the service")</annox:annotate>
@@ -3715,18 +3715,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}",requiredProps="service-type,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
+        <xs:element name="service-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -3760,18 +3760,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets",uriTemplate="/element-choice-sets/element-choice-set/{element-choice-set-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets",uriTemplate="/element-choice-sets/element-choice-set/{element-choice-set-uuid}",requiredProps="element-choice-set-uuid,element-choice-set-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="element-choice-set-uuid" type="xs:string">
+        <xs:element name="element-choice-set-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="element-choice-set-name" type="xs:string"/>
+        <xs:element name="element-choice-set-name" type="xs:string" minOccurs="0"/>
         <xs:element name="cardinality" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:model-elements" minOccurs="0"/>
@@ -3790,19 +3790,19 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets",uriTemplate="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets",uriTemplate="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}",requiredProps="constrained-element-set-uuid,constraint-type,check-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="constrained-element-set-uuid" type="xs:string">
+        <xs:element name="constrained-element-set-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="check-type" type="xs:string"/>
+        <xs:element name="constraint-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="check-type" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:element-choice-sets" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -3820,18 +3820,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints",uriTemplate="/model-constraints/model-constraint/{model-constraint-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints",uriTemplate="/model-constraints/model-constraint/{model-constraint-uuid}",requiredProps="model-constraint-uuid,constrained-element-set-uuid-to-replace")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-constraint-uuid" type="xs:string">
+        <xs:element name="model-constraint-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string"/>
+        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:constrained-element-sets" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
@@ -3854,25 +3854,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements",uriTemplate="/model-elements/model-element/{model-element-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements",uriTemplate="/model-elements/model-element/{model-element-uuid}",requiredProps="model-element-uuid,new-data-del-flag,cardinality")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-element-uuid" type="xs:string">
+        <xs:element name="model-element-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="new-data-del-flag" type="xs:string">
+        <xs:element name="new-data-del-flag" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates whether this element was created as part of instantiation from this model")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="cardinality" type="xs:string">
+        <xs:element name="cardinality" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="How many of this type of element are required/allowed")</annox:annotate>
@@ -3916,25 +3916,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version",uniqueProps="model-version-id",container="model-vers",uriTemplate="/model-vers/model-ver/{model-version-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version",uniqueProps="model-version-id",container="model-vers",uriTemplate="/model-vers/model-ver/{model-version-id}",requiredProps="model-version-id,model-name,model-version")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-version-id" type="xs:string">
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-name" type="xs:string">
+        <xs:element name="model-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-version" type="xs:string">
+        <xs:element name="model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate>
@@ -3972,18 +3972,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/models/model/{model-invariant-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/models/model/{model-invariant-id}",requiredProps="model-invariant-id,model-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string">
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-type" type="xs:string">
+        <xs:element name="model-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>
@@ -4018,21 +4018,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups",uriTemplate="/related-lookups/related-lookup/{related-lookup-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups",uriTemplate="/related-lookups/related-lookup/{related-lookup-uuid}",requiredProps="related-lookup-uuid,source-node-type,source-node-property,target-node-type,target-node-property")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="related-lookup-uuid" type="xs:string">
+        <xs:element name="related-lookup-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="source-node-type" type="xs:string"/>
-        <xs:element name="source-node-property" type="xs:string"/>
-        <xs:element name="target-node-type" type="xs:string"/>
-        <xs:element name="target-node-property" type="xs:string"/>
+        <xs:element name="source-node-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="source-node-property" type="xs:string" minOccurs="0"/>
+        <xs:element name="target-node-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="target-node-property" type="xs:string" minOccurs="0"/>
         <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="5000"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -4050,20 +4050,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints",uriTemplate="/property-constraints/property-constraint/{property-constraint-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints",uriTemplate="/property-constraints/property-constraint/{property-constraint-uuid}",requiredProps="property-constraint-uuid,constraint-type,property-name,property-value")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="property-constraint-uuid" type="xs:string">
+        <xs:element name="property-constraint-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="property-name" type="xs:string"/>
-        <xs:element name="property-value" type="xs:string"/>
+        <xs:element name="constraint-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
@@ -4079,11 +4079,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements",uriTemplate="/named-query-elements/named-query-element/{named-query-element-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements",uriTemplate="/named-query-elements/named-query-element/{named-query-element-uuid}",requiredProps="named-query-element-uuid")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="named-query-element-uuid" type="xs:string">
+        <xs:element name="named-query-element-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
@@ -4112,19 +4112,19 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/named-queries/named-query/{named-query-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/named-queries/named-query/{named-query-uuid}",requiredProps="named-query-uuid,named-query-name,named-query-version")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="named-query-uuid" type="xs:string">
+        <xs:element name="named-query-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="named-query-name" type="xs:string"/>
-        <xs:element name="named-query-version" type="xs:string"/>
+        <xs:element name="named-query-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="named-query-version" type="xs:string" minOccurs="0"/>
         <xs:element name="required-input-params" minOccurs="0">
           <xs:complexType>
             <xs:sequence>
@@ -4166,11 +4166,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",uriTemplate="/network/logical-links/logical-link/{link-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",uriTemplate="/network/logical-links/logical-link/{link-name}",requiredProps="link-name,in-maint,link-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
+        <xs:element name="link-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ")</annox:annotate>
@@ -4184,7 +4184,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="link-type" type="xs:string">
+        <xs:element name="link-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of logical link, e.g., evc")</annox:annotate>
@@ -4334,7 +4334,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="cos" type="xs:string">
+        <xs:element name="cos" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
@@ -4386,7 +4386,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="site-pair-id" type="xs:string">
+        <xs:element name="site-pair-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
@@ -4460,7 +4460,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="routing-instance-id" type="xs:string">
+        <xs:element name="routing-instance-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of routing instance")</annox:annotate>
@@ -4502,11 +4502,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network",uriTemplate="/network/site-pair-sets/site-pair-set/{site-pair-set-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network",uriTemplate="/network/site-pair-sets/site-pair-set/{site-pair-set-id}",requiredProps="site-pair-set-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="site-pair-set-id" type="xs:string">
+        <xs:element name="site-pair-set-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of site pair set.")</annox:annotate>
@@ -4541,18 +4541,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true",uriTemplate="/route-targets/route-target/{global-route-target}/{route-target-role}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true",uriTemplate="/route-targets/route-target/{global-route-target}/{route-target-role}",requiredProps="global-route-target,route-target-role")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="global-route-target" type="xs:string">
+        <xs:element name="global-route-target" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Number used to identify an RT, globally unique in the network")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="route-target-role" type="xs:string">
+        <xs:element name="route-target-role" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Role assigned to this route target")</annox:annotate>
@@ -4586,18 +4586,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}",requiredProps="vpn-id,vpn-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vpn-id" type="xs:string">
+        <xs:element name="vpn-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="VPN ID, globally unique within A&amp;AI")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vpn-name" type="xs:string">
+        <xs:element name="vpn-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VPN Name")</annox:annotate>
@@ -4668,11 +4668,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network",uriTemplate="/network/vpls-pes/vpls-pe/{equipment-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network",uriTemplate="/network/vpls-pes/vpls-pe/{equipment-name}",requiredProps="equipment-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="equipment-name" type="xs:string">
+        <xs:element name="equipment-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
@@ -4740,21 +4740,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="multicast-configuration-id" type="xs:string">
+        <xs:element name="multicast-configuration-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of multicast configuration.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="multicast-protocol" type="xs:string">
+        <xs:element name="multicast-protocol" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="protocol of multicast configuration")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="rp-type" type="xs:string">
+        <xs:element name="rp-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="rp type of multicast configuration")</annox:annotate>
@@ -4792,7 +4792,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
+        <xs:element name="cvlan-tag" type="xs:unsignedInt" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="See mis-na-virtualization-platform.yang")</annox:annotate>
@@ -4821,11 +4821,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-id" type="xs:string">
+        <xs:element name="interface-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the interface")</annox:annotate>
@@ -4881,7 +4881,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="orchestration-status" type="xs:string">
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
@@ -4918,18 +4918,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}",requiredProps="group-uuid,resource-uuid")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
+        <xs:element name="group-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the license group the resource belongs to, should be uuid.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
+        <xs:element name="resource-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of a license resource. ")</annox:annotate>
@@ -4963,18 +4963,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements",uriTemplate="/entitlements/entitlement/{group-uuid}/{resource-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements",uriTemplate="/entitlements/entitlement/{group-uuid}/{resource-uuid}",requiredProps="group-uuid,resource-uuid")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
+        <xs:element name="group-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the entitlement group the resource comes from, should be uuid.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
+        <xs:element name="resource-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of an entitlement resource. ")</annox:annotate>
@@ -5008,18 +5008,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
@@ -5033,7 +5033,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -5172,21 +5172,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnfc-name" type="xs:string">
+        <xs:element name="vnfc-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of vnfc.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="nfc-naming-code" type="xs:string">
+        <xs:element name="nfc-naming-code" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Short code that is used in naming instances of the item being modeled")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="nfc-function" type="xs:string">
+        <xs:element name="nfc-function" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service")</annox:annotate>
@@ -5289,21 +5289,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="host-route-id" type="xs:string">
+        <xs:element name="host-route-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="host-route id")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="route-prefix" type="xs:string">
+        <xs:element name="route-prefix" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="subnet prefix")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="next-hop" type="xs:string">
+        <xs:element name="next-hop" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Could be ip-address, hostname, or service-instance")</annox:annotate>
@@ -5343,7 +5343,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="subnet-id" type="xs:string">
+        <xs:element name="subnet-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Subnet ID, should be UUID.")</annox:annotate>
@@ -5468,7 +5468,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt">
+        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="id.")</annox:annotate>
@@ -5497,11 +5497,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments",uriTemplate="/segmentation-assignments/segmentation-assignment/{segmentation-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments",uriTemplate="/segmentation-assignments/segmentation-assignment/{segmentation-id}",requiredProps="segmentation-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="segmentation-id" type="xs:string">
+        <xs:element name="segmentation-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
@@ -5535,11 +5535,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="network-id" type="xs:string">
+        <xs:element name="network-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Network ID, should be uuid. Unique across A&amp;AI.")</annox:annotate>
@@ -5749,7 +5749,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="network-policy-id" type="xs:string">
+        <xs:element name="network-policy-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID representing unique key to this instance")</annox:annotate>
@@ -5792,11 +5792,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules",uriTemplate="/vf-modules/vf-module/{vf-module-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules",uriTemplate="/vf-modules/vf-module/{vf-module-id}",requiredProps="vf-module-id,is-base-vf-module")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vf-module-id" type="xs:string">
+        <xs:element name="vf-module-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of vf-module.")</annox:annotate>
@@ -5921,11 +5921,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs",uriTemplate="/network/generic-vnfs/generic-vnf/{vnf-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs",uriTemplate="/network/generic-vnfs/generic-vnf/{vnf-id}",requiredProps="vnf-id,vnf-type,in-maint,is-closed-loop-disabled")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
@@ -5953,7 +5953,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -6349,11 +6349,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network",uriTemplate="/network/lag-links/lag-link/{link-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network",uriTemplate="/network/lag-links/lag-link/{link-name}",requiredProps="link-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
+        <xs:element name="link-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Alphabetical concatenation of lag-interface names")</annox:annotate>
@@ -6387,18 +6387,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network",uriTemplate="/network/newvces/newvce/{vnf-id2}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network",uriTemplate="/network/newvces/newvce/{vnf-id2}",requiredProps="vnf-id2,vnf-name,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id2" type="xs:string">
+        <xs:element name="vnf-id2" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF, can't use same attribute name right now until we promote this new object")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
@@ -6412,7 +6412,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -6510,11 +6510,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="pnf-name" type="xs:string">
+        <xs:element name="pnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique name of Physical Network Function.")</annox:annotate>
@@ -6690,11 +6690,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id",uriTemplate="/network/physical-links/physical-link/{link-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id",uriTemplate="/network/physical-links/physical-link/{link-name}",requiredProps="link-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
+        <xs:element name="link-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ")</annox:annotate>
@@ -6798,11 +6798,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers",uriTemplate="/vig-servers/vig-server/{vig-address-type}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers",uriTemplate="/vig-servers/vig-server/{vig-address-type}",requiredProps="vig-address-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vig-address-type" type="xs:string">
+        <xs:element name="vig-address-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="indicates whether the VIG is for AVPN or INTERNET")</annox:annotate>
@@ -6845,11 +6845,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network",uriTemplate="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network",uriTemplate="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}",requiredProps="ipsec-configuration-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="ipsec-configuration-id" type="xs:string">
+        <xs:element name="ipsec-configuration-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of this configuration")</annox:annotate>
@@ -7019,18 +7019,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network",uriTemplate="/network/route-table-references/route-table-reference/{route-table-reference-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network",uriTemplate="/network/route-table-references/route-table-reference/{route-table-reference-id}",requiredProps="route-table-reference-id,route-table-reference-fqdn")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="route-table-reference-id" type="xs:string">
+        <xs:element name="route-table-reference-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="route-table-reference-fqdn" type="xs:string">
+        <xs:element name="route-table-reference-fqdn" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="FQDN entry in the route table.")</annox:annotate>
@@ -7064,7 +7064,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,description,type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7096,21 +7096,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="id" type="xs:string">
+        <xs:element name="id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Instance Group ID, UUID assigned to this instance.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="description" type="xs:string">
+        <xs:element name="description" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Descriptive text to help identify the usage of this instance-group")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="type" type="xs:string">
+        <xs:element name="type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability",dbAlias="instance-group-type")</annox:annotate>
@@ -7151,32 +7151,32 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network",uriTemplate="/network/zones/zone/{zone-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network",uriTemplate="/network/zones/zone/{zone-id}",requiredProps="zone-id,zone-name,design-type,zone-context")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="zone-id" type="xs:string">
+        <xs:element name="zone-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Code assigned by AIC to the zone")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="zone-name" type="xs:string">
+        <xs:element name="zone-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="English name associated with the zone")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="design-type" type="xs:string">
+        <xs:element name="design-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Design of zone [Medium/Large?]")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="zone-context" type="xs:string">
+        <xs:element name="zone-context" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Context of zone [production/test]")</annox:annotate>
@@ -7217,11 +7217,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Port Mirror Configuration.",indexedProps="configuration-id,model-invariant-id,model-version-id",uniqueProps="configuration-id",container="configurations",namespace="network",uriTemplate="/network/configurations/configuration/{configuration-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Port Mirror Configuration.",indexedProps="configuration-id,model-invariant-id,model-version-id",uniqueProps="configuration-id",container="configurations",namespace="network",uriTemplate="/network/configurations/configuration/{configuration-id}",requiredProps="configuration-id,configuration-type,configuration-sub-type,orchestration-status,operational-status,configuration-selflink,model-customization-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="configuration-id" type="xs:string">
+        <xs:element name="configuration-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID assigned to configuration.")</annox:annotate>
@@ -7242,14 +7242,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="configuration-type" type="xs:string">
+        <xs:element name="configuration-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="port-mirroring-configuration.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="configuration-sub-type" type="xs:string">
+        <xs:element name="configuration-sub-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="vprobe, pprobe.")</annox:annotate>
@@ -7277,28 +7277,28 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="orchestration-status" type="xs:string">
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of the configuration.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="operational-status" type="xs:string">
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="configuration-selflink" type="xs:string">
+        <xs:element name="configuration-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details from SDN-GC.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-customization-id" type="xs:string">
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="id of  the configuration used to customize the resource")</annox:annotate>
@@ -7434,46 +7434,46 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models",requiredProps="model-invariant-id,model-name-version-id,model-type,model-name,model-id,model-version")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string">
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-name-version-id" type="xs:string">
+        <xs:element name="model-name-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-type" type="xs:string">
+        <xs:element name="model-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-name" type="xs:string">
+        <xs:element name="model-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-id" type="xs:string">
+        <xs:element name="model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-version" type="xs:string">
+        <xs:element name="model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate>
@@ -7637,11 +7637,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true",requiredProps="vnf-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd
index 5e9dcf7..bacc1ca 100644 (file)
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd
@@ -113,14 +113,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="relationship-key" type="xs:string">
+        <xs:element name="relationship-key" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate an attribute.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="relationship-value" type="xs:string">
+        <xs:element name="relationship-value" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Value of the attribute.")</annox:annotate>
@@ -200,25 +200,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks",uriTemplate="/oam-networks/oam-network/{network-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks",uriTemplate="/oam-networks/oam-network/{network-uuid}",requiredProps="network-uuid,network-name,cvlan-tag")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="network-uuid" type="xs:string">
+        <xs:element name="network-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of the network. Unique across a cloud-region")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="network-name" type="xs:string">
+        <xs:element name="network-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the network.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
+        <xs:element name="cvlan-tag" type="xs:unsignedInt" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="cvlan-id")</annox:annotate>
@@ -266,18 +266,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches",uriTemplate="/dvs-switches/dvs-switch/{switch-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches",uriTemplate="/dvs-switches/dvs-switch/{switch-name}",requiredProps="switch-name,vcenter-url")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="switch-name" type="xs:string">
+        <xs:element name="switch-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="DVS switch name")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vcenter-url" type="xs:string">
+        <xs:element name="vcenter-url" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL used to reach the vcenter")</annox:annotate>
@@ -311,18 +311,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones",uriTemplate="/availability-zones/availability-zone/{availability-zone-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones",uriTemplate="/availability-zones/availability-zone/{availability-zone-name}",requiredProps="availability-zone-name,hypervisor-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="availability-zone-name" type="xs:string">
+        <xs:element name="availability-zone-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the availability zone.  Unique across a cloud region")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="hypervisor-type" type="xs:string">
+        <xs:element name="hypervisor-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of hypervisor.  Source of truth should define valid values.")</annox:annotate>
@@ -401,11 +401,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team.")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team.",requiredProps="update-node-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="update-node-type" type="xs:string"/>
+        <xs:element name="update-node-type" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:update-node-key" minOccurs="0" maxOccurs="5000"/>
         <xs:element name="update-node-uri" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:action" minOccurs="0" maxOccurs="5000"/>
@@ -423,7 +423,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
   <xs:element name="notify">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="event-id" type="xs:string"/>
+        <xs:element name="event-id" type="xs:string" minOccurs="0"/>
         <xs:element name="node-type" type="xs:string" minOccurs="0"/>
         <xs:element name="event-trigger" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:key-data" minOccurs="0" maxOccurs="5000"/>
@@ -448,25 +448,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools",uriTemplate="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools",uriTemplate="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}",requiredProps="target-pe,availability-zone-name,ctag-pool-purpose")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="target-pe" type="xs:string">
+        <xs:element name="target-pe" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="The Target provider edge router")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="availability-zone-name" type="xs:string">
+        <xs:element name="availability-zone-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the availability zone")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="ctag-pool-purpose" type="xs:string">
+        <xs:element name="ctag-pool-purpose" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Describes what the intended purpose of this pool is.")</annox:annotate>
@@ -502,11 +502,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/complexes/complex/{physical-location-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/complexes/complex/{physical-location-id}",requiredProps="physical-location-id,physical-location-type,street1,city,postal-code,country,region")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="physical-location-id" type="xs:string">
+        <xs:element name="physical-location-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier for physical location, e.g., CLLI")</annox:annotate>
@@ -541,20 +541,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="physical-location-type" type="xs:string">
+        <xs:element name="physical-location-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type, e.g., central office, data center.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="street1" type="xs:string"/>
+        <xs:element name="street1" type="xs:string" minOccurs="0"/>
         <xs:element name="street2" type="xs:string" minOccurs="0"/>
-        <xs:element name="city" type="xs:string"/>
+        <xs:element name="city" type="xs:string" minOccurs="0"/>
         <xs:element name="state" type="xs:string" minOccurs="0"/>
-        <xs:element name="postal-code" type="xs:string"/>
-        <xs:element name="country" type="xs:string"/>
-        <xs:element name="region" type="xs:string"/>
+        <xs:element name="postal-code" type="xs:string" minOccurs="0"/>
+        <xs:element name="country" type="xs:string" minOccurs="0"/>
+        <xs:element name="region" type="xs:string" minOccurs="0"/>
         <xs:element name="latitude" type="xs:string" minOccurs="0"/>
         <xs:element name="longitude" type="xs:string" minOccurs="0"/>
         <xs:element name="elevation" type="xs:string" minOccurs="0"/>
@@ -580,11 +580,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups",uriTemplate="/volume-groups/volume-group/{volume-group-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups",uriTemplate="/volume-groups/volume-group/{volume-group-id}",requiredProps="volume-group-id,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="volume-group-id" type="xs:string">
+        <xs:element name="volume-group-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of volume-group.")</annox:annotate>
@@ -605,7 +605,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -660,18 +660,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes",uriTemplate="/volumes/volume/{volume-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes",uriTemplate="/volumes/volume/{volume-id}",requiredProps="volume-id,volume-selflink")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="volume-id" type="xs:string">
+        <xs:element name="volume-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of block storage volume relative to the vserver.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="volume-selflink" type="xs:string">
+        <xs:element name="volume-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -705,11 +705,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc",uriTemplate="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc",uriTemplate="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}",requiredProps="l3-interface-ipv4-address")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="l3-interface-ipv4-address" type="xs:string">
+        <xs:element name="l3-interface-ipv4-address" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
@@ -773,11 +773,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc",uriTemplate="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc",uriTemplate="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}",requiredProps="l3-interface-ipv6-address")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="l3-interface-ipv6-address" type="xs:string">
+        <xs:element name="l3-interface-ipv6-address" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
@@ -841,11 +841,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans",uriTemplate="/vlans/vlan/{vlan-interface}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans",uriTemplate="/vlans/vlan/{vlan-interface}",requiredProps="vlan-interface,in-maint,is-ip-unnumbered")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vlan-interface" type="xs:string">
+        <xs:element name="vlan-interface" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="String that identifies the interface")</annox:annotate>
@@ -953,11 +953,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs",uriTemplate="/sriov-vfs/sriov-vf/{pci-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs",uriTemplate="/sriov-vfs/sriov-vf/{pci-id}",requiredProps="pci-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="pci-id" type="xs:string">
+        <xs:element name="pci-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="PCI ID used to identify the sriov-vf")</annox:annotate>
@@ -1075,11 +1075,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface",container="l-interfaces",uriTemplate="/l-interfaces/l-interface/{interface-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface",container="l-interfaces",uriTemplate="/l-interfaces/l-interface/{interface-name}",requiredProps="interface-name,is-port-mirrored,in-maint,is-ip-unnumbered")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
+        <xs:element name="interface-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name given to the interface")</annox:annotate>
@@ -1209,18 +1209,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers",uriTemplate="/vservers/vserver/{vserver-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers",uriTemplate="/vservers/vserver/{vserver-id}",requiredProps="vserver-id,vserver-name,vserver-selflink,in-maint,is-closed-loop-disabled")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vserver-id" type="xs:string">
+        <xs:element name="vserver-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier for this vserver relative to its tenant")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vserver-name" type="xs:string">
+        <xs:element name="vserver-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of vserver")</annox:annotate>
@@ -1241,7 +1241,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vserver-selflink" type="xs:string">
+        <xs:element name="vserver-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -1291,18 +1291,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id,tenant-context",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants",uriTemplate="/tenants/tenant/{tenant-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id,tenant-context",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants",uriTemplate="/tenants/tenant/{tenant-id}",requiredProps="tenant-id,tenant-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="tenant-id" type="xs:string">
+        <xs:element name="tenant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id relative to the cloud-region.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="tenant-name" type="xs:string">
+        <xs:element name="tenant-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Readable name of tenant")</annox:annotate>
@@ -1344,11 +1344,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="HPA Capability Feature attributes",indexedProps="hpa-attribute-key",dependentOn="hpa-capability")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="HPA Capability Feature attributes",indexedProps="hpa-attribute-key",dependentOn="hpa-capability",requiredProps="hpa-attribute-key")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="hpa-attribute-key" type="xs:string">
+        <xs:element name="hpa-attribute-key" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="name of the specific HPA attribute")</annox:annotate>
@@ -1377,18 +1377,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a HPA capability",indexedProps="hpa-feature,architecture,hpa-capability-id",dependentOn="flavor,cloud-region",container="hpa-capabilities")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a HPA capability",indexedProps="hpa-feature,architecture,hpa-capability-id",dependentOn="flavor,cloud-region",container="hpa-capabilities",requiredProps="hpa-capability-id,hpa-feature")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="hpa-capability-id" type="xs:string">
+        <xs:element name="hpa-capability-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID to uniquely identify a HPA capability")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="hpa-feature" type="xs:string">
+        <xs:element name="hpa-feature" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the HPACapability")</annox:annotate>
@@ -1437,18 +1437,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors",uriTemplate="/flavors/flavor/{flavor-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors",uriTemplate="/flavors/flavor/{flavor-id}",requiredProps="flavor-id,flavor-name,flavor-selflink")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="flavor-id" type="xs:string">
+        <xs:element name="flavor-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Flavor id, expected to be unique across cloud-region.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="flavor-name" type="xs:string">
+        <xs:element name="flavor-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Flavor name")</annox:annotate>
@@ -1497,7 +1497,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="flavor-selflink" type="xs:string">
+        <xs:element name="flavor-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -1545,25 +1545,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments",uriTemplate="/group-assignments/group-assignment/{group-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments",uriTemplate="/group-assignments/group-assignment/{group-id}",requiredProps="group-id,group-type,group-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="group-id" type="xs:string">
+        <xs:element name="group-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Group id, expected to be unique across cloud-region.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="group-type" type="xs:string">
+        <xs:element name="group-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group type - the type of group this instance refers to")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="group-name" type="xs:string">
+        <xs:element name="group-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group name - name assigned to the group")</annox:annotate>
@@ -1604,11 +1604,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots",uriTemplate="/snapshots/snapshot/{snapshot-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots",uriTemplate="/snapshots/snapshot/{snapshot-id}",requiredProps="snapshot-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="snapshot-id" type="xs:string">
+        <xs:element name="snapshot-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Snapshot id, this is the key UUID assoc associated in glance with the snapshots.")</annox:annotate>
@@ -1705,18 +1705,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata",uriTemplate="/metadata/metadatum/{metaname}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata",uriTemplate="/metadata/metadatum/{metaname}",requiredProps="metaname,metaval")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="metaname" type="xs:string">
+        <xs:element name="metaname" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="metaval" type="xs:string"/>
+        <xs:element name="metaval" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -1743,18 +1743,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images",uriTemplate="/images/image/{image-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images",uriTemplate="/images/image/{image-id}",requiredProps="image-id,image-name,image-os-distro,image-os-version,image-selflink")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="image-id" type="xs:string">
+        <xs:element name="image-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Image id, expected to be unique across cloud region")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-name" type="xs:string">
+        <xs:element name="image-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Image name")</annox:annotate>
@@ -1768,14 +1768,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-os-distro" type="xs:string">
+        <xs:element name="image-os-distro" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-os-version" type="xs:string">
+        <xs:element name="image-os-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The operating system version as specified by the distributor.")</annox:annotate>
@@ -1803,7 +1803,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-selflink" type="xs:string">
+        <xs:element name="image-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -1850,11 +1850,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv4-address-list/{vip-ipv4-address}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv4-address-list/{vip-ipv4-address}",requiredProps="vip-ipv4-address")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vip-ipv4-address" type="xs:string">
+        <xs:element name="vip-ipv4-address" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
@@ -1918,11 +1918,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv6-address-list/{vip-ipv6-address}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv6-address-list/{vip-ipv6-address}",requiredProps="vip-ipv6-address")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vip-ipv6-address" type="xs:string">
+        <xs:element name="vip-ipv6-address" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
@@ -1986,11 +1986,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist common address information of external systems.",indexedProps="esr-system-info-id,system-name,system-type",searchable="esr-system-info-id,system-name,system-type",container="esr-system-info-list",dependentOn="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist common address information of external systems.",indexedProps="esr-system-info-id,system-name,system-type",searchable="esr-system-info-id,system-name,system-type",container="esr-system-info-list",dependentOn="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc",requiredProps="esr-system-info-id,user-name,password,system-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="esr-system-info-id" type="xs:string">
+        <xs:element name="esr-system-info-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of esr system info.")</annox:annotate>
@@ -2032,21 +2032,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="user-name" type="xs:string">
+        <xs:element name="user-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="username used to access external systems.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="password" type="xs:string">
+        <xs:element name="password" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="password used to access external systems.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="system-type" type="xs:string">
+        <xs:element name="system-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="it could be vim/vnfm/thirdparty-sdnc/ems-resource/ems-performance/ems-alarm.")</annox:annotate>
@@ -2150,18 +2150,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}",requiredProps="cloud-owner,cloud-region-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="cloud-owner" type="xs:string">
+        <xs:element name="cloud-owner" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="cloud-region-id" type="xs:string">
+        <xs:element name="cloud-region-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifier used by the vendor for the region. Second part of composite key")</annox:annotate>
@@ -2277,11 +2277,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}",requiredProps="nm-profile-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="nm-profile-name" type="xs:string">
+        <xs:element name="nm-profile-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique name of network profile.")</annox:annotate>
@@ -2322,11 +2322,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Physical Function",indexedProps="pf-pci-id",dependentOn="p-interface",container="sriov-pfs",uriTemplate="/sriov-pfs/sriov-pf/{pf-pci-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Physical Function",indexedProps="pf-pci-id",dependentOn="p-interface",container="sriov-pfs",uriTemplate="/sriov-pfs/sriov-pf/{pf-pci-id}",requiredProps="pf-pci-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="pf-pci-id" type="xs:string">
+        <xs:element name="pf-pci-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifier for the sriov-pf")</annox:annotate>
@@ -2360,11 +2360,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
+        <xs:element name="interface-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name that identifies the physical interface")</annox:annotate>
@@ -2477,11 +2477,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces",uriTemplate="/lag-interfaces/lag-interface/{interface-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces",uriTemplate="/lag-interfaces/lag-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
+        <xs:element name="interface-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name that identifies the link aggregate interface")</annox:annotate>
@@ -2565,11 +2565,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",uniqueProps="hostname",container="pservers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/pservers/pserver/{hostname}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",uniqueProps="hostname",container="pservers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/pservers/pserver/{hostname}",requiredProps="hostname,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="hostname" type="xs:string">
+        <xs:element name="hostname" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Value from executing hostname on the compute node.")</annox:annotate>
@@ -2780,18 +2780,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}",requiredProps="vdc-id,vdc-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vdc-id" type="xs:string">
+        <xs:element name="vdc-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vdc")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vdc-name" type="xs:string">
+        <xs:element name="vdc-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the virtual data center")</annox:annotate>
@@ -2825,46 +2825,46 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="It is a logical partition of the cloud which allows to have multiple environments in the production AIC.",indexedProps="operational-environment-id",nameProps="operational-environment-name",uniqueProps="operational-environment-id",container="operational-environments",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/operational-environments/operational-environment/{operational-environment-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="It is a logical partition of the cloud which allows to have multiple environments in the production AIC.",indexedProps="operational-environment-id",nameProps="operational-environment-name",uniqueProps="operational-environment-id",container="operational-environments",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/operational-environments/operational-environment/{operational-environment-id}",requiredProps="operational-environment-id,operational-environment-name,operational-environment-type,operational-environment-status,tenant-context,workload-context")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="operational-environment-id" type="xs:string">
+        <xs:element name="operational-environment-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of an operational environment")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="operational-environment-name" type="xs:string">
+        <xs:element name="operational-environment-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operational Environment name")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="operational-environment-type" type="xs:string">
+        <xs:element name="operational-environment-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operational Environment Type.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="operational-environment-status" type="xs:string">
+        <xs:element name="operational-environment-status" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Status")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="tenant-context" type="xs:string">
+        <xs:element name="tenant-context" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Tenant Context.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="workload-context" type="xs:string">
+        <xs:element name="workload-context" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Workload Context.")</annox:annotate>
@@ -2915,11 +2915,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist EMS address information used by EMS driver.",indexedProps="ems-id",searchable="ems-id",container="esr-ems-list",namespace="external-system")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist EMS address information used by EMS driver.",indexedProps="ems-id",searchable="ems-id",container="esr-ems-list",namespace="external-system",requiredProps="ems-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="ems-id" type="xs:string">
+        <xs:element name="ems-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of EMS.")</annox:annotate>
@@ -2954,11 +2954,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist VNFM address information used by VF-C.",indexedProps="vnfm-id",searchable="vnfm-id",container="esr-vnfm-list",namespace="external-system")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist VNFM address information used by VF-C.",indexedProps="vnfm-id",searchable="vnfm-id",container="esr-vnfm-list",namespace="external-system",requiredProps="vnfm-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnfm-id" type="xs:string">
+        <xs:element name="vnfm-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of VNFM.")</annox:annotate>
@@ -3007,11 +3007,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="thirdparty-sdnc-id" type="xs:string">
+        <xs:element name="thirdparty-sdnc-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of SDNC.")</annox:annotate>
@@ -3074,11 +3074,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business",uriTemplate="/business/connectors/connector/{resource-instance-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business",uriTemplate="/business/connectors/connector/{resource-instance-id}",requiredProps="resource-instance-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="resource-instance-id" type="xs:string">
+        <xs:element name="resource-instance-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of resource instance.")</annox:annotate>
@@ -3148,11 +3148,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects",uriTemplate="/tunnel-xconnects/tunnel-xconnect/{id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects",uriTemplate="/tunnel-xconnects/tunnel-xconnect/{id}",requiredProps="id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="id" type="xs:string">
+        <xs:element name="id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
@@ -3214,11 +3214,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role",dependentOn="service-instance",container="allotted-resources",uriTemplate="/allotted-resources/allotted-resource/{id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role",dependentOn="service-instance",container="allotted-resources",uriTemplate="/allotted-resources/allotted-resource/{id}",requiredProps="id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="id" type="xs:string">
+        <xs:element name="id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
@@ -3316,11 +3316,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}",requiredProps="service-instance-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-instance-id" type="xs:string">
+        <xs:element name="service-instance-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this instance of a service")</annox:annotate>
@@ -3510,11 +3510,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type",uriTemplate="/service-subscriptions/service-subscription/{service-type}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type",uriTemplate="/service-subscriptions/service-subscription/{service-type}",requiredProps="service-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
+        <xs:element name="service-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Value defined by orchestration to identify this service across ECOMP.")</annox:annotate>
@@ -3556,25 +3556,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business",uriTemplate="/business/customers/customer/{global-customer-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business",uriTemplate="/business/customers/customer/{global-customer-id}",requiredProps="global-customer-id,subscriber-name,subscriber-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="global-customer-id" type="xs:string">
+        <xs:element name="global-customer-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Global customer id used across ECOMP to uniquely identify customer.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="subscriber-name" type="xs:string">
+        <xs:element name="subscriber-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Subscriber name, an alternate way to retrieve a customer.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="subscriber-type" type="xs:string">
+        <xs:element name="subscriber-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Subscriber type, a way to provide VID with only the INFRA customers.",defaultValue="CUST")</annox:annotate>
@@ -3609,11 +3609,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a line-of-business",indexedProps="line-of-business-name",uniqueProps="line-of-business-name",container="lines-of-business",namespace="business",uriTemplate="/business/lines-of-business/line-of-business/{line-of-business-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a line-of-business",indexedProps="line-of-business-name",uniqueProps="line-of-business-name",container="lines-of-business",namespace="business",uriTemplate="/business/lines-of-business/line-of-business/{line-of-business-name}",requiredProps="line-of-business-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="line-of-business-name" type="xs:string">
+        <xs:element name="line-of-business-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the line-of-business (product)")</annox:annotate>
@@ -3647,18 +3647,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes an owning-entity",indexedProps="owning-entity-id,owning-entity-name",searchable="owning-entity-id",uniqueProps="owning-entity-id,owning-entity-name",container="owning-entities",namespace="business",uriTemplate="/business/owning-entities/owning-entity/{owning-entity-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes an owning-entity",indexedProps="owning-entity-id,owning-entity-name",searchable="owning-entity-id",uniqueProps="owning-entity-id,owning-entity-name",container="owning-entities",namespace="business",uriTemplate="/business/owning-entities/owning-entity/{owning-entity-id}",requiredProps="owning-entity-id,owning-entity-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="owning-entity-id" type="xs:string">
+        <xs:element name="owning-entity-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of an owning entity")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="owning-entity-name" type="xs:string">
+        <xs:element name="owning-entity-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Owning entity name")</annox:annotate>
@@ -3692,11 +3692,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a platform",indexedProps="platform-name",uniqueProps="platform-name",container="platforms",namespace="business",uriTemplate="/business/platforms/platform/{platform-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a platform",indexedProps="platform-name",uniqueProps="platform-name",container="platforms",namespace="business",uriTemplate="/business/platforms/platform/{platform-name}",requiredProps="platform-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="platform-name" type="xs:string">
+        <xs:element name="platform-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the platform")</annox:annotate>
@@ -3730,11 +3730,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes the project",indexedProps="project-name",uniqueProps="project-name",container="projects",namespace="business",uriTemplate="/business/projects/project/{project-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes the project",indexedProps="project-name",uniqueProps="project-name",container="projects",namespace="business",uriTemplate="/business/projects/project/{project-name}",requiredProps="project-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="project-name" type="xs:string">
+        <xs:element name="project-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the project deploying a service")</annox:annotate>
@@ -3785,25 +3785,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}",requiredProps="vnf-image-uuid,application,application-vendor")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-image-uuid" type="xs:string">
+        <xs:element name="vnf-image-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of this asset")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="application" type="xs:string">
+        <xs:element name="application" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="application-vendor" type="xs:string">
+        <xs:element name="application-vendor" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
@@ -3851,18 +3851,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/services/service/{service-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/services/service/{service-id}",requiredProps="service-id,service-description")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-id" type="xs:string">
+        <xs:element name="service-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="service-description" type="xs:string">
+        <xs:element name="service-description" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Description of the service")</annox:annotate>
@@ -3910,18 +3910,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}",requiredProps="service-type,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
+        <xs:element name="service-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -3955,18 +3955,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets",uriTemplate="/element-choice-sets/element-choice-set/{element-choice-set-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets",uriTemplate="/element-choice-sets/element-choice-set/{element-choice-set-uuid}",requiredProps="element-choice-set-uuid,element-choice-set-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="element-choice-set-uuid" type="xs:string">
+        <xs:element name="element-choice-set-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="element-choice-set-name" type="xs:string"/>
+        <xs:element name="element-choice-set-name" type="xs:string" minOccurs="0"/>
         <xs:element name="cardinality" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:model-elements" minOccurs="0"/>
@@ -3985,19 +3985,19 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets",uriTemplate="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets",uriTemplate="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}",requiredProps="constrained-element-set-uuid,constraint-type,check-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="constrained-element-set-uuid" type="xs:string">
+        <xs:element name="constrained-element-set-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="check-type" type="xs:string"/>
+        <xs:element name="constraint-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="check-type" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:element-choice-sets" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -4015,18 +4015,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints",uriTemplate="/model-constraints/model-constraint/{model-constraint-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints",uriTemplate="/model-constraints/model-constraint/{model-constraint-uuid}",requiredProps="model-constraint-uuid,constrained-element-set-uuid-to-replace")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-constraint-uuid" type="xs:string">
+        <xs:element name="model-constraint-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string"/>
+        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:constrained-element-sets" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
@@ -4049,25 +4049,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements",uriTemplate="/model-elements/model-element/{model-element-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements",uriTemplate="/model-elements/model-element/{model-element-uuid}",requiredProps="model-element-uuid,new-data-del-flag,cardinality")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-element-uuid" type="xs:string">
+        <xs:element name="model-element-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="new-data-del-flag" type="xs:string">
+        <xs:element name="new-data-del-flag" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates whether this element was created as part of instantiation from this model")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="cardinality" type="xs:string">
+        <xs:element name="cardinality" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="How many of this type of element are required/allowed")</annox:annotate>
@@ -4111,25 +4111,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version,distribution-status",uniqueProps="model-version-id",container="model-vers",uriTemplate="/model-vers/model-ver/{model-version-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version,distribution-status",uniqueProps="model-version-id",container="model-vers",uriTemplate="/model-vers/model-ver/{model-version-id}",requiredProps="model-version-id,model-name,model-version")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-version-id" type="xs:string">
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-name" type="xs:string">
+        <xs:element name="model-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-version" type="xs:string">
+        <xs:element name="model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate>
@@ -4174,18 +4174,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/models/model/{model-invariant-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/models/model/{model-invariant-id}",requiredProps="model-invariant-id,model-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string">
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-type" type="xs:string">
+        <xs:element name="model-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>
@@ -4220,21 +4220,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups",uriTemplate="/related-lookups/related-lookup/{related-lookup-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups",uriTemplate="/related-lookups/related-lookup/{related-lookup-uuid}",requiredProps="related-lookup-uuid,source-node-type,source-node-property,target-node-type,target-node-property")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="related-lookup-uuid" type="xs:string">
+        <xs:element name="related-lookup-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="source-node-type" type="xs:string"/>
-        <xs:element name="source-node-property" type="xs:string"/>
-        <xs:element name="target-node-type" type="xs:string"/>
-        <xs:element name="target-node-property" type="xs:string"/>
+        <xs:element name="source-node-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="source-node-property" type="xs:string" minOccurs="0"/>
+        <xs:element name="target-node-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="target-node-property" type="xs:string" minOccurs="0"/>
         <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="5000"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -4252,20 +4252,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints",uriTemplate="/property-constraints/property-constraint/{property-constraint-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints",uriTemplate="/property-constraints/property-constraint/{property-constraint-uuid}",requiredProps="property-constraint-uuid,constraint-type,property-name,property-value")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="property-constraint-uuid" type="xs:string">
+        <xs:element name="property-constraint-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="property-name" type="xs:string"/>
-        <xs:element name="property-value" type="xs:string"/>
+        <xs:element name="constraint-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
@@ -4281,11 +4281,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements",uriTemplate="/named-query-elements/named-query-element/{named-query-element-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements",uriTemplate="/named-query-elements/named-query-element/{named-query-element-uuid}",requiredProps="named-query-element-uuid")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="named-query-element-uuid" type="xs:string">
+        <xs:element name="named-query-element-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
@@ -4314,19 +4314,19 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/named-queries/named-query/{named-query-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/named-queries/named-query/{named-query-uuid}",requiredProps="named-query-uuid,named-query-name,named-query-version")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="named-query-uuid" type="xs:string">
+        <xs:element name="named-query-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="named-query-name" type="xs:string"/>
-        <xs:element name="named-query-version" type="xs:string"/>
+        <xs:element name="named-query-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="named-query-version" type="xs:string" minOccurs="0"/>
         <xs:element name="required-input-params" minOccurs="0">
           <xs:complexType>
             <xs:sequence>
@@ -4368,11 +4368,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",uriTemplate="/network/logical-links/logical-link/{link-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",uriTemplate="/network/logical-links/logical-link/{link-name}",requiredProps="link-name,in-maint,link-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
+        <xs:element name="link-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ")</annox:annotate>
@@ -4386,7 +4386,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="link-type" type="xs:string">
+        <xs:element name="link-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of logical link, e.g., evc")</annox:annotate>
@@ -4536,7 +4536,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="cos" type="xs:string">
+        <xs:element name="cos" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
@@ -4588,7 +4588,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="site-pair-id" type="xs:string">
+        <xs:element name="site-pair-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
@@ -4662,7 +4662,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="routing-instance-id" type="xs:string">
+        <xs:element name="routing-instance-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of routing instance")</annox:annotate>
@@ -4704,11 +4704,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network",uriTemplate="/network/site-pair-sets/site-pair-set/{site-pair-set-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network",uriTemplate="/network/site-pair-sets/site-pair-set/{site-pair-set-id}",requiredProps="site-pair-set-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="site-pair-set-id" type="xs:string">
+        <xs:element name="site-pair-set-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of site pair set.")</annox:annotate>
@@ -4743,18 +4743,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true",uriTemplate="/route-targets/route-target/{global-route-target}/{route-target-role}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true",uriTemplate="/route-targets/route-target/{global-route-target}/{route-target-role}",requiredProps="global-route-target,route-target-role")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="global-route-target" type="xs:string">
+        <xs:element name="global-route-target" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Number used to identify an RT, globally unique in the network")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="route-target-role" type="xs:string">
+        <xs:element name="route-target-role" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Role assigned to this route target")</annox:annotate>
@@ -4788,18 +4788,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}",requiredProps="vpn-id,vpn-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vpn-id" type="xs:string">
+        <xs:element name="vpn-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="VPN ID, globally unique within A&amp;AI")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vpn-name" type="xs:string">
+        <xs:element name="vpn-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VPN Name")</annox:annotate>
@@ -4870,11 +4870,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network",uriTemplate="/network/vpls-pes/vpls-pe/{equipment-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network",uriTemplate="/network/vpls-pes/vpls-pe/{equipment-name}",requiredProps="equipment-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="equipment-name" type="xs:string">
+        <xs:element name="equipment-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
@@ -4942,21 +4942,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="multicast-configuration-id" type="xs:string">
+        <xs:element name="multicast-configuration-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of multicast configuration.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="multicast-protocol" type="xs:string">
+        <xs:element name="multicast-protocol" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="protocol of multicast configuration")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="rp-type" type="xs:string">
+        <xs:element name="rp-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="rp type of multicast configuration")</annox:annotate>
@@ -4994,7 +4994,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
+        <xs:element name="cvlan-tag" type="xs:unsignedInt" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="See mis-na-virtualization-platform.yang")</annox:annotate>
@@ -5023,11 +5023,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-id" type="xs:string">
+        <xs:element name="interface-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the interface")</annox:annotate>
@@ -5083,7 +5083,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="orchestration-status" type="xs:string">
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
@@ -5120,18 +5120,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}",requiredProps="group-uuid,resource-uuid")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
+        <xs:element name="group-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the license group the resource belongs to, should be uuid.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
+        <xs:element name="resource-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of a license resource. ")</annox:annotate>
@@ -5165,18 +5165,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements",uriTemplate="/entitlements/entitlement/{group-uuid}/{resource-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements",uriTemplate="/entitlements/entitlement/{group-uuid}/{resource-uuid}",requiredProps="group-uuid,resource-uuid")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
+        <xs:element name="group-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the entitlement group the resource comes from, should be uuid.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
+        <xs:element name="resource-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of an entitlement resource. ")</annox:annotate>
@@ -5210,18 +5210,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
@@ -5235,7 +5235,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -5374,21 +5374,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnfc-name" type="xs:string">
+        <xs:element name="vnfc-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of vnfc.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="nfc-naming-code" type="xs:string">
+        <xs:element name="nfc-naming-code" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Short code that is used in naming instances of the item being modeled")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="nfc-function" type="xs:string">
+        <xs:element name="nfc-function" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service")</annox:annotate>
@@ -5491,21 +5491,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="host-route-id" type="xs:string">
+        <xs:element name="host-route-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="host-route id")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="route-prefix" type="xs:string">
+        <xs:element name="route-prefix" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="subnet prefix")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="next-hop" type="xs:string">
+        <xs:element name="next-hop" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Could be ip-address, hostname, or service-instance")</annox:annotate>
@@ -5545,7 +5545,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="subnet-id" type="xs:string">
+        <xs:element name="subnet-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Subnet ID, should be UUID.")</annox:annotate>
@@ -5670,7 +5670,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt">
+        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="id.")</annox:annotate>
@@ -5699,11 +5699,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments",uriTemplate="/segmentation-assignments/segmentation-assignment/{segmentation-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments",uriTemplate="/segmentation-assignments/segmentation-assignment/{segmentation-id}",requiredProps="segmentation-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="segmentation-id" type="xs:string">
+        <xs:element name="segmentation-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
@@ -5737,11 +5737,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="network-id" type="xs:string">
+        <xs:element name="network-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Network ID, should be uuid. Unique across A&amp;AI.")</annox:annotate>
@@ -5951,7 +5951,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="network-policy-id" type="xs:string">
+        <xs:element name="network-policy-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID representing unique key to this instance")</annox:annotate>
@@ -5994,11 +5994,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules",uriTemplate="/vf-modules/vf-module/{vf-module-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules",uriTemplate="/vf-modules/vf-module/{vf-module-id}",requiredProps="vf-module-id,is-base-vf-module")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vf-module-id" type="xs:string">
+        <xs:element name="vf-module-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of vf-module.")</annox:annotate>
@@ -6123,11 +6123,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs",uriTemplate="/network/generic-vnfs/generic-vnf/{vnf-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs",uriTemplate="/network/generic-vnfs/generic-vnf/{vnf-id}",requiredProps="vnf-id,vnf-type,in-maint,is-closed-loop-disabled")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
@@ -6155,7 +6155,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -6551,11 +6551,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network",uriTemplate="/network/lag-links/lag-link/{link-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network",uriTemplate="/network/lag-links/lag-link/{link-name}",requiredProps="link-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
+        <xs:element name="link-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Alphabetical concatenation of lag-interface names")</annox:annotate>
@@ -6589,18 +6589,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network",uriTemplate="/network/newvces/newvce/{vnf-id2}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network",uriTemplate="/network/newvces/newvce/{vnf-id2}",requiredProps="vnf-id2,vnf-name,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id2" type="xs:string">
+        <xs:element name="vnf-id2" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF, can't use same attribute name right now until we promote this new object")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
@@ -6614,7 +6614,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -6712,11 +6712,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="pnf-name" type="xs:string">
+        <xs:element name="pnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique name of Physical Network Function.")</annox:annotate>
@@ -6899,11 +6899,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id",uriTemplate="/network/physical-links/physical-link/{link-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id",uriTemplate="/network/physical-links/physical-link/{link-name}",requiredProps="link-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
+        <xs:element name="link-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ")</annox:annotate>
@@ -7007,11 +7007,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers",uriTemplate="/vig-servers/vig-server/{vig-address-type}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers",uriTemplate="/vig-servers/vig-server/{vig-address-type}",requiredProps="vig-address-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vig-address-type" type="xs:string">
+        <xs:element name="vig-address-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="indicates whether the VIG is for AVPN or INTERNET")</annox:annotate>
@@ -7054,11 +7054,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network",uriTemplate="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network",uriTemplate="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}",requiredProps="ipsec-configuration-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="ipsec-configuration-id" type="xs:string">
+        <xs:element name="ipsec-configuration-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of this configuration")</annox:annotate>
@@ -7228,18 +7228,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network",uriTemplate="/network/route-table-references/route-table-reference/{route-table-reference-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network",uriTemplate="/network/route-table-references/route-table-reference/{route-table-reference-id}",requiredProps="route-table-reference-id,route-table-reference-fqdn")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="route-table-reference-id" type="xs:string">
+        <xs:element name="route-table-reference-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="route-table-reference-fqdn" type="xs:string">
+        <xs:element name="route-table-reference-fqdn" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="FQDN entry in the route table.")</annox:annotate>
@@ -7273,7 +7273,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,description,type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7305,21 +7305,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="id" type="xs:string">
+        <xs:element name="id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Instance Group ID, UUID assigned to this instance.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="description" type="xs:string">
+        <xs:element name="description" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Descriptive text to help identify the usage of this instance-group")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="type" type="xs:string">
+        <xs:element name="type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability",dbAlias="instance-group-type")</annox:annotate>
@@ -7360,32 +7360,32 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network",uriTemplate="/network/zones/zone/{zone-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network",uriTemplate="/network/zones/zone/{zone-id}",requiredProps="zone-id,zone-name,design-type,zone-context")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="zone-id" type="xs:string">
+        <xs:element name="zone-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Code assigned by AIC to the zone")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="zone-name" type="xs:string">
+        <xs:element name="zone-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="English name associated with the zone")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="design-type" type="xs:string">
+        <xs:element name="design-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Design of zone [Medium/Large…]")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="zone-context" type="xs:string">
+        <xs:element name="zone-context" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Context of zone [production/test]")</annox:annotate>
@@ -7426,11 +7426,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="forwarder object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="forwarder-evc-id",container="forwarder-evcs",uriTemplate="/forwarder-evcs/forwarder-evc/{forwarder-evc-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="forwarder object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="forwarder-evc-id",container="forwarder-evcs",uriTemplate="/forwarder-evcs/forwarder-evc/{forwarder-evc-id}",requiredProps="forwarder-evc-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="forwarder-evc-id" type="xs:string">
+        <xs:element name="forwarder-evc-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Key for forwarder-evc object")</annox:annotate>
@@ -7487,11 +7487,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="evc object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="evc-id",container="evcs",uriTemplate="/evcs/evc/{evc-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="evc object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="evc-id",container="evcs",uriTemplate="/evcs/evc/{evc-id}",requiredProps="evc-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="evc-id" type="xs:string">
+        <xs:element name="evc-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique/key field for the evc object")</annox:annotate>
@@ -7611,11 +7611,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic configuration object.",indexedProps="configuration-id,model-invariant-id,model-version-id",uniqueProps="configuration-id",container="configurations",namespace="network",uriTemplate="/network/configurations/configuration/{configuration-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic configuration object.",indexedProps="configuration-id,model-invariant-id,model-version-id",uniqueProps="configuration-id",container="configurations",namespace="network",uriTemplate="/network/configurations/configuration/{configuration-id}",requiredProps="configuration-id,configuration-type,configuration-sub-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="configuration-id" type="xs:string">
+        <xs:element name="configuration-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID assigned to configuration.")</annox:annotate>
@@ -7636,14 +7636,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="configuration-type" type="xs:string">
+        <xs:element name="configuration-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="port-mirroring-configuration.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="configuration-sub-type" type="xs:string">
+        <xs:element name="configuration-sub-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="vprobe, pprobe.")</annox:annotate>
@@ -7743,11 +7743,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="sequence",description="Entity describing a sequenced segment of forwarding path",container="forwarders",dependentOn="forwarding-path",uriTemplate="/forwarders/forwarder/{sequence}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="sequence",description="Entity describing a sequenced segment of forwarding path",container="forwarders",dependentOn="forwarding-path",uriTemplate="/forwarders/forwarder/{sequence}",requiredProps="sequence")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="sequence" type="xs:int">
+        <xs:element name="sequence" type="xs:int" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of this segmentation")</annox:annotate>
@@ -7783,18 +7783,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",indexedProps="forwarding-path-id,forwarding-path-name",description="Entity that describes the sequenced forwarding path between interfaces of services or resources",container="forwarding-paths",nameProps="forwarding-path-name",uniqueProps="forwarding-path-id",uriTemplate="/network/forwarding-paths/forwarding-path/{forwarding-path-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",indexedProps="forwarding-path-id,forwarding-path-name",description="Entity that describes the sequenced forwarding path between interfaces of services or resources",container="forwarding-paths",nameProps="forwarding-path-name",uniqueProps="forwarding-path-id",uriTemplate="/network/forwarding-paths/forwarding-path/{forwarding-path-id}",requiredProps="forwarding-path-id,forwarding-path-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="forwarding-path-id" type="xs:string">
+        <xs:element name="forwarding-path-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of this FP")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="forwarding-path-name" type="xs:string">
+        <xs:element name="forwarding-path-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the FP")</annox:annotate>
@@ -7935,46 +7935,46 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models",requiredProps="model-invariant-id,model-name-version-id,model-type,model-name,model-id,model-version")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string">
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-name-version-id" type="xs:string">
+        <xs:element name="model-name-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-type" type="xs:string">
+        <xs:element name="model-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-name" type="xs:string">
+        <xs:element name="model-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-id" type="xs:string">
+        <xs:element name="model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-version" type="xs:string">
+        <xs:element name="model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate>
@@ -8138,11 +8138,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true",requiredProps="vnf-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd
index b6ccc0f..abe2a0d 100644 (file)
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd
@@ -113,14 +113,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="relationship-key" type="xs:string">
+        <xs:element name="relationship-key" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate an attribute.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="relationship-value" type="xs:string">
+        <xs:element name="relationship-value" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Value of the attribute.")</annox:annotate>
@@ -200,25 +200,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks",uriTemplate="/oam-networks/oam-network/{network-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks",uriTemplate="/oam-networks/oam-network/{network-uuid}",requiredProps="network-uuid,network-name,cvlan-tag")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="network-uuid" type="xs:string">
+        <xs:element name="network-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of the network. Unique across a cloud-region")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="network-name" type="xs:string">
+        <xs:element name="network-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the network.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
+        <xs:element name="cvlan-tag" type="xs:unsignedInt" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="cvlan-id")</annox:annotate>
@@ -266,18 +266,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches",uriTemplate="/dvs-switches/dvs-switch/{switch-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches",uriTemplate="/dvs-switches/dvs-switch/{switch-name}",requiredProps="switch-name,vcenter-url")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="switch-name" type="xs:string">
+        <xs:element name="switch-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="DVS switch name")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vcenter-url" type="xs:string">
+        <xs:element name="vcenter-url" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL used to reach the vcenter")</annox:annotate>
@@ -311,18 +311,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones",uriTemplate="/availability-zones/availability-zone/{availability-zone-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones",uriTemplate="/availability-zones/availability-zone/{availability-zone-name}",requiredProps="availability-zone-name,hypervisor-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="availability-zone-name" type="xs:string">
+        <xs:element name="availability-zone-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the availability zone.  Unique across a cloud region")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="hypervisor-type" type="xs:string">
+        <xs:element name="hypervisor-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of hypervisor.  Source of truth should define valid values.")</annox:annotate>
@@ -401,11 +401,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team.")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team.",requiredProps="update-node-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="update-node-type" type="xs:string"/>
+        <xs:element name="update-node-type" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:update-node-key" minOccurs="0" maxOccurs="5000"/>
         <xs:element name="update-node-uri" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:action" minOccurs="0" maxOccurs="5000"/>
@@ -423,7 +423,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
   <xs:element name="notify">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="event-id" type="xs:string"/>
+        <xs:element name="event-id" type="xs:string" minOccurs="0"/>
         <xs:element name="node-type" type="xs:string" minOccurs="0"/>
         <xs:element name="event-trigger" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:key-data" minOccurs="0" maxOccurs="5000"/>
@@ -448,25 +448,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools",uriTemplate="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools",uriTemplate="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}",requiredProps="target-pe,availability-zone-name,ctag-pool-purpose")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="target-pe" type="xs:string">
+        <xs:element name="target-pe" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="The Target provider edge router")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="availability-zone-name" type="xs:string">
+        <xs:element name="availability-zone-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the availability zone")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="ctag-pool-purpose" type="xs:string">
+        <xs:element name="ctag-pool-purpose" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Describes what the intended purpose of this pool is.")</annox:annotate>
@@ -502,11 +502,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/complexes/complex/{physical-location-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/complexes/complex/{physical-location-id}",requiredProps="physical-location-id,physical-location-type,street1,city,postal-code,country,region")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="physical-location-id" type="xs:string">
+        <xs:element name="physical-location-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier for physical location, e.g., CLLI")</annox:annotate>
@@ -541,20 +541,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="physical-location-type" type="xs:string">
+        <xs:element name="physical-location-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type, e.g., central office, data center.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="street1" type="xs:string"/>
+        <xs:element name="street1" type="xs:string" minOccurs="0"/>
         <xs:element name="street2" type="xs:string" minOccurs="0"/>
-        <xs:element name="city" type="xs:string"/>
+        <xs:element name="city" type="xs:string" minOccurs="0"/>
         <xs:element name="state" type="xs:string" minOccurs="0"/>
-        <xs:element name="postal-code" type="xs:string"/>
-        <xs:element name="country" type="xs:string"/>
-        <xs:element name="region" type="xs:string"/>
+        <xs:element name="postal-code" type="xs:string" minOccurs="0"/>
+        <xs:element name="country" type="xs:string" minOccurs="0"/>
+        <xs:element name="region" type="xs:string" minOccurs="0"/>
         <xs:element name="latitude" type="xs:string" minOccurs="0"/>
         <xs:element name="longitude" type="xs:string" minOccurs="0"/>
         <xs:element name="elevation" type="xs:string" minOccurs="0"/>
@@ -580,11 +580,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups",uriTemplate="/volume-groups/volume-group/{volume-group-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups",uriTemplate="/volume-groups/volume-group/{volume-group-id}",requiredProps="volume-group-id,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="volume-group-id" type="xs:string">
+        <xs:element name="volume-group-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of volume-group.")</annox:annotate>
@@ -605,7 +605,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -660,18 +660,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes",uriTemplate="/volumes/volume/{volume-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes",uriTemplate="/volumes/volume/{volume-id}",requiredProps="volume-id,volume-selflink")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="volume-id" type="xs:string">
+        <xs:element name="volume-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of block storage volume relative to the vserver.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="volume-selflink" type="xs:string">
+        <xs:element name="volume-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -705,11 +705,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc",uriTemplate="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc",uriTemplate="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}",requiredProps="l3-interface-ipv4-address")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="l3-interface-ipv4-address" type="xs:string">
+        <xs:element name="l3-interface-ipv4-address" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
@@ -773,11 +773,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc",uriTemplate="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc",uriTemplate="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}",requiredProps="l3-interface-ipv6-address")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="l3-interface-ipv6-address" type="xs:string">
+        <xs:element name="l3-interface-ipv6-address" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
@@ -841,11 +841,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans",uriTemplate="/vlans/vlan/{vlan-interface}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans",uriTemplate="/vlans/vlan/{vlan-interface}",requiredProps="vlan-interface,in-maint,is-ip-unnumbered")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vlan-interface" type="xs:string">
+        <xs:element name="vlan-interface" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="String that identifies the interface")</annox:annotate>
@@ -953,11 +953,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs",uriTemplate="/sriov-vfs/sriov-vf/{pci-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs",uriTemplate="/sriov-vfs/sriov-vf/{pci-id}",requiredProps="pci-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="pci-id" type="xs:string">
+        <xs:element name="pci-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="PCI ID used to identify the sriov-vf")</annox:annotate>
@@ -1075,11 +1075,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface",container="l-interfaces",uriTemplate="/l-interfaces/l-interface/{interface-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface",container="l-interfaces",uriTemplate="/l-interfaces/l-interface/{interface-name}",requiredProps="interface-name,is-port-mirrored,in-maint,is-ip-unnumbered")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
+        <xs:element name="interface-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name given to the interface")</annox:annotate>
@@ -1209,18 +1209,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers",uriTemplate="/vservers/vserver/{vserver-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers",uriTemplate="/vservers/vserver/{vserver-id}",requiredProps="vserver-id,vserver-name,vserver-selflink,in-maint,is-closed-loop-disabled")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vserver-id" type="xs:string">
+        <xs:element name="vserver-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier for this vserver relative to its tenant")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vserver-name" type="xs:string">
+        <xs:element name="vserver-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of vserver")</annox:annotate>
@@ -1241,7 +1241,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vserver-selflink" type="xs:string">
+        <xs:element name="vserver-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -1291,18 +1291,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id,tenant-context",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants",uriTemplate="/tenants/tenant/{tenant-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id,tenant-context",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants",uriTemplate="/tenants/tenant/{tenant-id}",requiredProps="tenant-id,tenant-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="tenant-id" type="xs:string">
+        <xs:element name="tenant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id relative to the cloud-region.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="tenant-name" type="xs:string">
+        <xs:element name="tenant-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Readable name of tenant")</annox:annotate>
@@ -1344,11 +1344,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="HPA Capability Feature attributes",indexedProps="hpa-attribute-key",dependentOn="hpa-capability")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="HPA Capability Feature attributes",indexedProps="hpa-attribute-key",dependentOn="hpa-capability",requiredProps="hpa-attribute-key")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="hpa-attribute-key" type="xs:string">
+        <xs:element name="hpa-attribute-key" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="name of the specific HPA attribute")</annox:annotate>
@@ -1377,18 +1377,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a HPA capability",indexedProps="hpa-feature,architecture,hpa-capability-id",dependentOn="flavor,cloud-region",container="hpa-capabilities")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a HPA capability",indexedProps="hpa-feature,architecture,hpa-capability-id",dependentOn="flavor,cloud-region",container="hpa-capabilities",requiredProps="hpa-capability-id,hpa-feature")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="hpa-capability-id" type="xs:string">
+        <xs:element name="hpa-capability-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID to uniquely identify a HPA capability")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="hpa-feature" type="xs:string">
+        <xs:element name="hpa-feature" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the HPACapability")</annox:annotate>
@@ -1437,18 +1437,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors",uriTemplate="/flavors/flavor/{flavor-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors",uriTemplate="/flavors/flavor/{flavor-id}",requiredProps="flavor-id,flavor-name,flavor-selflink")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="flavor-id" type="xs:string">
+        <xs:element name="flavor-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Flavor id, expected to be unique across cloud-region.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="flavor-name" type="xs:string">
+        <xs:element name="flavor-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Flavor name")</annox:annotate>
@@ -1497,7 +1497,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="flavor-selflink" type="xs:string">
+        <xs:element name="flavor-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -1545,25 +1545,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments",uriTemplate="/group-assignments/group-assignment/{group-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments",uriTemplate="/group-assignments/group-assignment/{group-id}",requiredProps="group-id,group-type,group-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="group-id" type="xs:string">
+        <xs:element name="group-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Group id, expected to be unique across cloud-region.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="group-type" type="xs:string">
+        <xs:element name="group-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group type - the type of group this instance refers to")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="group-name" type="xs:string">
+        <xs:element name="group-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group name - name assigned to the group")</annox:annotate>
@@ -1604,11 +1604,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots",uriTemplate="/snapshots/snapshot/{snapshot-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots",uriTemplate="/snapshots/snapshot/{snapshot-id}",requiredProps="snapshot-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="snapshot-id" type="xs:string">
+        <xs:element name="snapshot-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Snapshot id, this is the key UUID assoc associated in glance with the snapshots.")</annox:annotate>
@@ -1705,18 +1705,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata",uriTemplate="/metadata/metadatum/{metaname}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata",uriTemplate="/metadata/metadatum/{metaname}",requiredProps="metaname,metaval")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="metaname" type="xs:string">
+        <xs:element name="metaname" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="metaval" type="xs:string"/>
+        <xs:element name="metaval" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -1743,18 +1743,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images",uriTemplate="/images/image/{image-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images",uriTemplate="/images/image/{image-id}",requiredProps="image-id,image-name,image-os-distro,image-os-version,image-selflink")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="image-id" type="xs:string">
+        <xs:element name="image-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Image id, expected to be unique across cloud region")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-name" type="xs:string">
+        <xs:element name="image-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Image name")</annox:annotate>
@@ -1768,14 +1768,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-os-distro" type="xs:string">
+        <xs:element name="image-os-distro" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-os-version" type="xs:string">
+        <xs:element name="image-os-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The operating system version as specified by the distributor.")</annox:annotate>
@@ -1803,7 +1803,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-selflink" type="xs:string">
+        <xs:element name="image-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -1850,11 +1850,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv4-address-list/{vip-ipv4-address}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv4-address-list/{vip-ipv4-address}",requiredProps="vip-ipv4-address")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vip-ipv4-address" type="xs:string">
+        <xs:element name="vip-ipv4-address" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
@@ -1918,11 +1918,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv6-address-list/{vip-ipv6-address}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv6-address-list/{vip-ipv6-address}",requiredProps="vip-ipv6-address")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vip-ipv6-address" type="xs:string">
+        <xs:element name="vip-ipv6-address" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
@@ -1986,11 +1986,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist common address information of external systems.",indexedProps="esr-system-info-id,system-name,system-type",searchable="esr-system-info-id,system-name,system-type",container="esr-system-info-list",dependentOn="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist common address information of external systems.",indexedProps="esr-system-info-id,system-name,system-type",searchable="esr-system-info-id,system-name,system-type",container="esr-system-info-list",dependentOn="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc",requiredProps="esr-system-info-id,user-name,password,system-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="esr-system-info-id" type="xs:string">
+        <xs:element name="esr-system-info-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of esr system info.")</annox:annotate>
@@ -2032,21 +2032,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="user-name" type="xs:string">
+        <xs:element name="user-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="username used to access external systems.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="password" type="xs:string">
+        <xs:element name="password" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="password used to access external systems.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="system-type" type="xs:string">
+        <xs:element name="system-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="it could be vim/vnfm/thirdparty-sdnc/ems-resource/ems-performance/ems-alarm.")</annox:annotate>
@@ -2150,18 +2150,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}",requiredProps="cloud-owner,cloud-region-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="cloud-owner" type="xs:string">
+        <xs:element name="cloud-owner" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="cloud-region-id" type="xs:string">
+        <xs:element name="cloud-region-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifier used by the vendor for the region. Second part of composite key")</annox:annotate>
@@ -2277,11 +2277,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}",requiredProps="nm-profile-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="nm-profile-name" type="xs:string">
+        <xs:element name="nm-profile-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique name of network profile.")</annox:annotate>
@@ -2322,11 +2322,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Physical Function",indexedProps="pf-pci-id",dependentOn="p-interface",container="sriov-pfs",uriTemplate="/sriov-pfs/sriov-pf/{pf-pci-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Physical Function",indexedProps="pf-pci-id",dependentOn="p-interface",container="sriov-pfs",uriTemplate="/sriov-pfs/sriov-pf/{pf-pci-id}",requiredProps="pf-pci-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="pf-pci-id" type="xs:string">
+        <xs:element name="pf-pci-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifier for the sriov-pf")</annox:annotate>
@@ -2360,11 +2360,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
+        <xs:element name="interface-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name that identifies the physical interface")</annox:annotate>
@@ -2477,11 +2477,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces",uriTemplate="/lag-interfaces/lag-interface/{interface-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces",uriTemplate="/lag-interfaces/lag-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
+        <xs:element name="interface-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name that identifies the link aggregate interface")</annox:annotate>
@@ -2565,11 +2565,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",uniqueProps="hostname",container="pservers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/pservers/pserver/{hostname}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",uniqueProps="hostname",container="pservers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/pservers/pserver/{hostname}",requiredProps="hostname,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="hostname" type="xs:string">
+        <xs:element name="hostname" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Value from executing hostname on the compute node.")</annox:annotate>
@@ -2780,18 +2780,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}",requiredProps="vdc-id,vdc-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vdc-id" type="xs:string">
+        <xs:element name="vdc-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vdc")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vdc-name" type="xs:string">
+        <xs:element name="vdc-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the virtual data center")</annox:annotate>
@@ -2825,46 +2825,46 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="It is a logical partition of the cloud which allows to have multiple environments in the production AIC.",indexedProps="operational-environment-id",nameProps="operational-environment-name",uniqueProps="operational-environment-id",container="operational-environments",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/operational-environments/operational-environment/{operational-environment-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="It is a logical partition of the cloud which allows to have multiple environments in the production AIC.",indexedProps="operational-environment-id",nameProps="operational-environment-name",uniqueProps="operational-environment-id",container="operational-environments",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/operational-environments/operational-environment/{operational-environment-id}",requiredProps="operational-environment-id,operational-environment-name,operational-environment-type,operational-environment-status,tenant-context,workload-context")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="operational-environment-id" type="xs:string">
+        <xs:element name="operational-environment-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of an operational environment")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="operational-environment-name" type="xs:string">
+        <xs:element name="operational-environment-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operational Environment name")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="operational-environment-type" type="xs:string">
+        <xs:element name="operational-environment-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operational Environment Type.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="operational-environment-status" type="xs:string">
+        <xs:element name="operational-environment-status" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Status")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="tenant-context" type="xs:string">
+        <xs:element name="tenant-context" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Tenant Context.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="workload-context" type="xs:string">
+        <xs:element name="workload-context" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Workload Context.")</annox:annotate>
@@ -2915,11 +2915,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist EMS address information used by EMS driver.",indexedProps="ems-id",searchable="ems-id",container="esr-ems-list",namespace="external-system")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist EMS address information used by EMS driver.",indexedProps="ems-id",searchable="ems-id",container="esr-ems-list",namespace="external-system",requiredProps="ems-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="ems-id" type="xs:string">
+        <xs:element name="ems-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of EMS.")</annox:annotate>
@@ -2954,11 +2954,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist VNFM address information used by VF-C.",indexedProps="vnfm-id",searchable="vnfm-id",container="esr-vnfm-list",namespace="external-system")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist VNFM address information used by VF-C.",indexedProps="vnfm-id",searchable="vnfm-id",container="esr-vnfm-list",namespace="external-system",requiredProps="vnfm-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnfm-id" type="xs:string">
+        <xs:element name="vnfm-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of VNFM.")</annox:annotate>
@@ -3007,11 +3007,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="thirdparty-sdnc-id" type="xs:string">
+        <xs:element name="thirdparty-sdnc-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of SDNC.")</annox:annotate>
@@ -3074,11 +3074,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business",uriTemplate="/business/connectors/connector/{resource-instance-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business",uriTemplate="/business/connectors/connector/{resource-instance-id}",requiredProps="resource-instance-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="resource-instance-id" type="xs:string">
+        <xs:element name="resource-instance-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of resource instance.")</annox:annotate>
@@ -3141,11 +3141,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects",uriTemplate="/tunnel-xconnects/tunnel-xconnect/{id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects",uriTemplate="/tunnel-xconnects/tunnel-xconnect/{id}",requiredProps="id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="id" type="xs:string">
+        <xs:element name="id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
@@ -3207,11 +3207,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role",dependentOn="service-instance",container="allotted-resources",uriTemplate="/allotted-resources/allotted-resource/{id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role",dependentOn="service-instance",container="allotted-resources",uriTemplate="/allotted-resources/allotted-resource/{id}",requiredProps="id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="id" type="xs:string">
+        <xs:element name="id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
@@ -3302,11 +3302,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}",requiredProps="service-instance-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-instance-id" type="xs:string">
+        <xs:element name="service-instance-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this instance of a service")</annox:annotate>
@@ -3496,11 +3496,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type",uriTemplate="/service-subscriptions/service-subscription/{service-type}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type",uriTemplate="/service-subscriptions/service-subscription/{service-type}",requiredProps="service-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
+        <xs:element name="service-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Value defined by orchestration to identify this service across ECOMP.")</annox:annotate>
@@ -3542,25 +3542,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business",uriTemplate="/business/customers/customer/{global-customer-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business",uriTemplate="/business/customers/customer/{global-customer-id}",requiredProps="global-customer-id,subscriber-name,subscriber-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="global-customer-id" type="xs:string">
+        <xs:element name="global-customer-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Global customer id used across ECOMP to uniquely identify customer.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="subscriber-name" type="xs:string">
+        <xs:element name="subscriber-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Subscriber name, an alternate way to retrieve a customer.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="subscriber-type" type="xs:string">
+        <xs:element name="subscriber-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Subscriber type, a way to provide VID with only the INFRA customers.",defaultValue="CUST")</annox:annotate>
@@ -3595,11 +3595,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a line-of-business",indexedProps="line-of-business-name",uniqueProps="line-of-business-name",container="lines-of-business",namespace="business",uriTemplate="/business/lines-of-business/line-of-business/{line-of-business-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a line-of-business",indexedProps="line-of-business-name",uniqueProps="line-of-business-name",container="lines-of-business",namespace="business",uriTemplate="/business/lines-of-business/line-of-business/{line-of-business-name}",requiredProps="line-of-business-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="line-of-business-name" type="xs:string">
+        <xs:element name="line-of-business-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the line-of-business (product)")</annox:annotate>
@@ -3633,18 +3633,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes an owning-entity",indexedProps="owning-entity-id,owning-entity-name",searchable="owning-entity-id",uniqueProps="owning-entity-id,owning-entity-name",container="owning-entities",namespace="business",uriTemplate="/business/owning-entities/owning-entity/{owning-entity-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes an owning-entity",indexedProps="owning-entity-id,owning-entity-name",searchable="owning-entity-id",uniqueProps="owning-entity-id,owning-entity-name",container="owning-entities",namespace="business",uriTemplate="/business/owning-entities/owning-entity/{owning-entity-id}",requiredProps="owning-entity-id,owning-entity-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="owning-entity-id" type="xs:string">
+        <xs:element name="owning-entity-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of an owning entity")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="owning-entity-name" type="xs:string">
+        <xs:element name="owning-entity-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Owning entity name")</annox:annotate>
@@ -3678,11 +3678,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a platform",indexedProps="platform-name",uniqueProps="platform-name",container="platforms",namespace="business",uriTemplate="/business/platforms/platform/{platform-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a platform",indexedProps="platform-name",uniqueProps="platform-name",container="platforms",namespace="business",uriTemplate="/business/platforms/platform/{platform-name}",requiredProps="platform-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="platform-name" type="xs:string">
+        <xs:element name="platform-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the platform")</annox:annotate>
@@ -3716,11 +3716,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes the project",indexedProps="project-name",uniqueProps="project-name",container="projects",namespace="business",uriTemplate="/business/projects/project/{project-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes the project",indexedProps="project-name",uniqueProps="project-name",container="projects",namespace="business",uriTemplate="/business/projects/project/{project-name}",requiredProps="project-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="project-name" type="xs:string">
+        <xs:element name="project-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the project deploying a service")</annox:annotate>
@@ -3771,25 +3771,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}",requiredProps="vnf-image-uuid,application,application-vendor")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-image-uuid" type="xs:string">
+        <xs:element name="vnf-image-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of this asset")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="application" type="xs:string">
+        <xs:element name="application" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="application-vendor" type="xs:string">
+        <xs:element name="application-vendor" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
@@ -3837,18 +3837,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/services/service/{service-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/services/service/{service-id}",requiredProps="service-id,service-description")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-id" type="xs:string">
+        <xs:element name="service-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="service-description" type="xs:string">
+        <xs:element name="service-description" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Description of the service")</annox:annotate>
@@ -3896,18 +3896,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}",requiredProps="service-type,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
+        <xs:element name="service-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -3941,18 +3941,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets",uriTemplate="/element-choice-sets/element-choice-set/{element-choice-set-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets",uriTemplate="/element-choice-sets/element-choice-set/{element-choice-set-uuid}",requiredProps="element-choice-set-uuid,element-choice-set-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="element-choice-set-uuid" type="xs:string">
+        <xs:element name="element-choice-set-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="element-choice-set-name" type="xs:string"/>
+        <xs:element name="element-choice-set-name" type="xs:string" minOccurs="0"/>
         <xs:element name="cardinality" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:model-elements" minOccurs="0"/>
@@ -3971,19 +3971,19 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets",uriTemplate="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets",uriTemplate="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}",requiredProps="constrained-element-set-uuid,constraint-type,check-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="constrained-element-set-uuid" type="xs:string">
+        <xs:element name="constrained-element-set-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="check-type" type="xs:string"/>
+        <xs:element name="constraint-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="check-type" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:element-choice-sets" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -4001,18 +4001,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints",uriTemplate="/model-constraints/model-constraint/{model-constraint-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints",uriTemplate="/model-constraints/model-constraint/{model-constraint-uuid}",requiredProps="model-constraint-uuid,constrained-element-set-uuid-to-replace")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-constraint-uuid" type="xs:string">
+        <xs:element name="model-constraint-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string"/>
+        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:constrained-element-sets" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
@@ -4035,25 +4035,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements",uriTemplate="/model-elements/model-element/{model-element-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements",uriTemplate="/model-elements/model-element/{model-element-uuid}",requiredProps="model-element-uuid,new-data-del-flag,cardinality")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-element-uuid" type="xs:string">
+        <xs:element name="model-element-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="new-data-del-flag" type="xs:string">
+        <xs:element name="new-data-del-flag" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates whether this element was created as part of instantiation from this model")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="cardinality" type="xs:string">
+        <xs:element name="cardinality" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="How many of this type of element are required/allowed")</annox:annotate>
@@ -4097,25 +4097,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version,distribution-status",uniqueProps="model-version-id",container="model-vers",uriTemplate="/model-vers/model-ver/{model-version-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version,distribution-status",uniqueProps="model-version-id",container="model-vers",uriTemplate="/model-vers/model-ver/{model-version-id}",requiredProps="model-version-id,model-name,model-version")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-version-id" type="xs:string">
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-name" type="xs:string">
+        <xs:element name="model-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-version" type="xs:string">
+        <xs:element name="model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate>
@@ -4160,18 +4160,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/models/model/{model-invariant-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/models/model/{model-invariant-id}",requiredProps="model-invariant-id,model-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string">
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-type" type="xs:string">
+        <xs:element name="model-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>
@@ -4206,21 +4206,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups",uriTemplate="/related-lookups/related-lookup/{related-lookup-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups",uriTemplate="/related-lookups/related-lookup/{related-lookup-uuid}",requiredProps="related-lookup-uuid,source-node-type,source-node-property,target-node-type,target-node-property")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="related-lookup-uuid" type="xs:string">
+        <xs:element name="related-lookup-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="source-node-type" type="xs:string"/>
-        <xs:element name="source-node-property" type="xs:string"/>
-        <xs:element name="target-node-type" type="xs:string"/>
-        <xs:element name="target-node-property" type="xs:string"/>
+        <xs:element name="source-node-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="source-node-property" type="xs:string" minOccurs="0"/>
+        <xs:element name="target-node-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="target-node-property" type="xs:string" minOccurs="0"/>
         <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="5000"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -4238,20 +4238,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints",uriTemplate="/property-constraints/property-constraint/{property-constraint-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints",uriTemplate="/property-constraints/property-constraint/{property-constraint-uuid}",requiredProps="property-constraint-uuid,constraint-type,property-name,property-value")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="property-constraint-uuid" type="xs:string">
+        <xs:element name="property-constraint-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="property-name" type="xs:string"/>
-        <xs:element name="property-value" type="xs:string"/>
+        <xs:element name="constraint-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
@@ -4267,11 +4267,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements",uriTemplate="/named-query-elements/named-query-element/{named-query-element-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements",uriTemplate="/named-query-elements/named-query-element/{named-query-element-uuid}",requiredProps="named-query-element-uuid")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="named-query-element-uuid" type="xs:string">
+        <xs:element name="named-query-element-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
@@ -4300,19 +4300,19 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/named-queries/named-query/{named-query-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/named-queries/named-query/{named-query-uuid}",requiredProps="named-query-uuid,named-query-name,named-query-version")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="named-query-uuid" type="xs:string">
+        <xs:element name="named-query-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="named-query-name" type="xs:string"/>
-        <xs:element name="named-query-version" type="xs:string"/>
+        <xs:element name="named-query-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="named-query-version" type="xs:string" minOccurs="0"/>
         <xs:element name="required-input-params" minOccurs="0">
           <xs:complexType>
             <xs:sequence>
@@ -4354,11 +4354,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",uriTemplate="/network/logical-links/logical-link/{link-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",uriTemplate="/network/logical-links/logical-link/{link-name}",requiredProps="link-name,in-maint,link-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
+        <xs:element name="link-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ")</annox:annotate>
@@ -4372,7 +4372,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="link-type" type="xs:string">
+        <xs:element name="link-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of logical link, e.g., evc")</annox:annotate>
@@ -4515,7 +4515,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="cos" type="xs:string">
+        <xs:element name="cos" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
@@ -4567,7 +4567,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="site-pair-id" type="xs:string">
+        <xs:element name="site-pair-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
@@ -4641,7 +4641,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="routing-instance-id" type="xs:string">
+        <xs:element name="routing-instance-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of routing instance")</annox:annotate>
@@ -4683,11 +4683,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network",uriTemplate="/network/site-pair-sets/site-pair-set/{site-pair-set-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network",uriTemplate="/network/site-pair-sets/site-pair-set/{site-pair-set-id}",requiredProps="site-pair-set-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="site-pair-set-id" type="xs:string">
+        <xs:element name="site-pair-set-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of site pair set.")</annox:annotate>
@@ -4722,18 +4722,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true",uriTemplate="/route-targets/route-target/{global-route-target}/{route-target-role}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true",uriTemplate="/route-targets/route-target/{global-route-target}/{route-target-role}",requiredProps="global-route-target,route-target-role")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="global-route-target" type="xs:string">
+        <xs:element name="global-route-target" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Number used to identify an RT, globally unique in the network")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="route-target-role" type="xs:string">
+        <xs:element name="route-target-role" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Role assigned to this route target")</annox:annotate>
@@ -4767,18 +4767,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}",requiredProps="vpn-id,vpn-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vpn-id" type="xs:string">
+        <xs:element name="vpn-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="VPN ID, globally unique within A&amp;AI")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vpn-name" type="xs:string">
+        <xs:element name="vpn-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VPN Name")</annox:annotate>
@@ -4849,11 +4849,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network",uriTemplate="/network/vpls-pes/vpls-pe/{equipment-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network",uriTemplate="/network/vpls-pes/vpls-pe/{equipment-name}",requiredProps="equipment-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="equipment-name" type="xs:string">
+        <xs:element name="equipment-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
@@ -4921,21 +4921,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="multicast-configuration-id" type="xs:string">
+        <xs:element name="multicast-configuration-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of multicast configuration.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="multicast-protocol" type="xs:string">
+        <xs:element name="multicast-protocol" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="protocol of multicast configuration")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="rp-type" type="xs:string">
+        <xs:element name="rp-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="rp type of multicast configuration")</annox:annotate>
@@ -4973,7 +4973,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
+        <xs:element name="cvlan-tag" type="xs:unsignedInt" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="See mis-na-virtualization-platform.yang")</annox:annotate>
@@ -5002,11 +5002,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-id" type="xs:string">
+        <xs:element name="interface-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the interface")</annox:annotate>
@@ -5062,7 +5062,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="orchestration-status" type="xs:string">
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
@@ -5099,18 +5099,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}",requiredProps="group-uuid,resource-uuid")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
+        <xs:element name="group-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the license group the resource belongs to, should be uuid.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
+        <xs:element name="resource-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of a license resource. ")</annox:annotate>
@@ -5144,18 +5144,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements",uriTemplate="/entitlements/entitlement/{group-uuid}/{resource-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements",uriTemplate="/entitlements/entitlement/{group-uuid}/{resource-uuid}",requiredProps="group-uuid,resource-uuid")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
+        <xs:element name="group-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the entitlement group the resource comes from, should be uuid.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
+        <xs:element name="resource-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of an entitlement resource. ")</annox:annotate>
@@ -5189,18 +5189,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
@@ -5214,7 +5214,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -5353,21 +5353,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnfc-name" type="xs:string">
+        <xs:element name="vnfc-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of vnfc.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="nfc-naming-code" type="xs:string">
+        <xs:element name="nfc-naming-code" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Short code that is used in naming instances of the item being modeled")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="nfc-function" type="xs:string">
+        <xs:element name="nfc-function" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service")</annox:annotate>
@@ -5463,21 +5463,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="host-route-id" type="xs:string">
+        <xs:element name="host-route-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="host-route id")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="route-prefix" type="xs:string">
+        <xs:element name="route-prefix" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="subnet prefix")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="next-hop" type="xs:string">
+        <xs:element name="next-hop" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Could be ip-address, hostname, or service-instance")</annox:annotate>
@@ -5517,7 +5517,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="subnet-id" type="xs:string">
+        <xs:element name="subnet-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Subnet ID, should be UUID.")</annox:annotate>
@@ -5642,7 +5642,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt">
+        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="id.")</annox:annotate>
@@ -5671,11 +5671,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments",uriTemplate="/segmentation-assignments/segmentation-assignment/{segmentation-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments",uriTemplate="/segmentation-assignments/segmentation-assignment/{segmentation-id}",requiredProps="segmentation-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="segmentation-id" type="xs:string">
+        <xs:element name="segmentation-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
@@ -5709,11 +5709,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="network-id" type="xs:string">
+        <xs:element name="network-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Network ID, should be uuid. Unique across A&amp;AI.")</annox:annotate>
@@ -5923,7 +5923,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="network-policy-id" type="xs:string">
+        <xs:element name="network-policy-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID representing unique key to this instance")</annox:annotate>
@@ -5966,11 +5966,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules",uriTemplate="/vf-modules/vf-module/{vf-module-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules",uriTemplate="/vf-modules/vf-module/{vf-module-id}",requiredProps="vf-module-id,is-base-vf-module,automated-assignment")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vf-module-id" type="xs:string">
+        <xs:element name="vf-module-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of vf-module.")</annox:annotate>
@@ -6102,11 +6102,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role",searchable="vnf-id,vnf-name,vnf-name2,operational-status",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs",uriTemplate="/network/generic-vnfs/generic-vnf/{vnf-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role",searchable="vnf-id,vnf-name,vnf-name2,operational-status",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs",uriTemplate="/network/generic-vnfs/generic-vnf/{vnf-id}",requiredProps="vnf-id,vnf-type,in-maint,is-closed-loop-disabled")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
@@ -6134,7 +6134,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -6530,11 +6530,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network",uriTemplate="/network/lag-links/lag-link/{link-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network",uriTemplate="/network/lag-links/lag-link/{link-name}",requiredProps="link-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
+        <xs:element name="link-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Alphabetical concatenation of lag-interface names")</annox:annotate>
@@ -6568,18 +6568,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network",uriTemplate="/network/newvces/newvce/{vnf-id2}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network",uriTemplate="/network/newvces/newvce/{vnf-id2}",requiredProps="vnf-id2,vnf-name,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id2" type="xs:string">
+        <xs:element name="vnf-id2" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF, can't use same attribute name right now until we promote this new object")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
@@ -6593,7 +6593,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -6691,11 +6691,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="pnf-name" type="xs:string">
+        <xs:element name="pnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique name of Physical Network Function.")</annox:annotate>
@@ -6892,11 +6892,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id",uriTemplate="/network/physical-links/physical-link/{link-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id",uriTemplate="/network/physical-links/physical-link/{link-name}",requiredProps="link-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
+        <xs:element name="link-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ")</annox:annotate>
@@ -7000,11 +7000,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers",uriTemplate="/vig-servers/vig-server/{vig-address-type}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers",uriTemplate="/vig-servers/vig-server/{vig-address-type}",requiredProps="vig-address-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vig-address-type" type="xs:string">
+        <xs:element name="vig-address-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="indicates whether the VIG is for AVPN or INTERNET")</annox:annotate>
@@ -7047,11 +7047,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network",uriTemplate="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network",uriTemplate="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}",requiredProps="ipsec-configuration-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="ipsec-configuration-id" type="xs:string">
+        <xs:element name="ipsec-configuration-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of this configuration")</annox:annotate>
@@ -7221,18 +7221,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network",uriTemplate="/network/route-table-references/route-table-reference/{route-table-reference-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network",uriTemplate="/network/route-table-references/route-table-reference/{route-table-reference-id}",requiredProps="route-table-reference-id,route-table-reference-fqdn")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="route-table-reference-id" type="xs:string">
+        <xs:element name="route-table-reference-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="route-table-reference-fqdn" type="xs:string">
+        <xs:element name="route-table-reference-fqdn" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="FQDN entry in the route table.")</annox:annotate>
@@ -7266,11 +7266,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,description,instance-group-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="id" type="xs:string">
+        <xs:element name="id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Instance Group ID, UUID assigned to this instance.")</annox:annotate>
@@ -7298,14 +7298,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="description" type="xs:string">
+        <xs:element name="description" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Descriptive text to help identify the usage of this instance-group")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="instance-group-type" type="xs:string">
+        <xs:element name="instance-group-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability")</annox:annotate>
@@ -7353,32 +7353,32 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network",uriTemplate="/network/zones/zone/{zone-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network",uriTemplate="/network/zones/zone/{zone-id}",requiredProps="zone-id,zone-name,design-type,zone-context")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="zone-id" type="xs:string">
+        <xs:element name="zone-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Code assigned by AIC to the zone")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="zone-name" type="xs:string">
+        <xs:element name="zone-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="English name associated with the zone")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="design-type" type="xs:string">
+        <xs:element name="design-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Design of zone [Medium/Large…]")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="zone-context" type="xs:string">
+        <xs:element name="zone-context" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Context of zone [production/test]")</annox:annotate>
@@ -7419,11 +7419,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="forwarder object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="forwarder-evc-id",container="forwarder-evcs",uriTemplate="/forwarder-evcs/forwarder-evc/{forwarder-evc-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="forwarder object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="forwarder-evc-id",container="forwarder-evcs",uriTemplate="/forwarder-evcs/forwarder-evc/{forwarder-evc-id}",requiredProps="forwarder-evc-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="forwarder-evc-id" type="xs:string">
+        <xs:element name="forwarder-evc-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Key for forwarder-evc object")</annox:annotate>
@@ -7480,11 +7480,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="evc object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="evc-id",container="evcs",uriTemplate="/evcs/evc/{evc-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="evc object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="evc-id",container="evcs",uriTemplate="/evcs/evc/{evc-id}",requiredProps="evc-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="evc-id" type="xs:string">
+        <xs:element name="evc-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique/key field for the evc object")</annox:annotate>
@@ -7604,11 +7604,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic configuration object.",indexedProps="configuration-id,model-invariant-id,model-version-id",uniqueProps="configuration-id",container="configurations",namespace="network",uriTemplate="/network/configurations/configuration/{configuration-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic configuration object.",indexedProps="configuration-id,model-invariant-id,model-version-id",uniqueProps="configuration-id",container="configurations",namespace="network",uriTemplate="/network/configurations/configuration/{configuration-id}",requiredProps="configuration-id,configuration-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="configuration-id" type="xs:string">
+        <xs:element name="configuration-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID assigned to configuration.")</annox:annotate>
@@ -7629,7 +7629,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="configuration-type" type="xs:string">
+        <xs:element name="configuration-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="port-mirroring-configuration.")</annox:annotate>
@@ -7729,11 +7729,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="sequence",description="Entity describing a sequenced segment of forwarding path",container="forwarders",dependentOn="forwarding-path",uriTemplate="/forwarders/forwarder/{sequence}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="sequence",description="Entity describing a sequenced segment of forwarding path",container="forwarders",dependentOn="forwarding-path",uriTemplate="/forwarders/forwarder/{sequence}",requiredProps="sequence")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="sequence" type="xs:int">
+        <xs:element name="sequence" type="xs:int" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of this segmentation")</annox:annotate>
@@ -7769,18 +7769,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",indexedProps="forwarding-path-id,forwarding-path-name",description="Entity that describes the sequenced forwarding path between interfaces of services or resources",container="forwarding-paths",nameProps="forwarding-path-name",uniqueProps="forwarding-path-id",uriTemplate="/network/forwarding-paths/forwarding-path/{forwarding-path-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",indexedProps="forwarding-path-id,forwarding-path-name",description="Entity that describes the sequenced forwarding path between interfaces of services or resources",container="forwarding-paths",nameProps="forwarding-path-name",uniqueProps="forwarding-path-id",uriTemplate="/network/forwarding-paths/forwarding-path/{forwarding-path-id}",requiredProps="forwarding-path-id,forwarding-path-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="forwarding-path-id" type="xs:string">
+        <xs:element name="forwarding-path-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of this FP")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="forwarding-path-name" type="xs:string">
+        <xs:element name="forwarding-path-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the FP")</annox:annotate>
@@ -7817,11 +7817,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",description="represents the collection resource in the TOSCA model",uniqueProps="collection-id",indexedProps="collection-id,model-invariant-id,model-version-id",container="collections",uriTemplate="/network/collections/collection/{collection-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",description="represents the collection resource in the TOSCA model",uniqueProps="collection-id",indexedProps="collection-id,model-invariant-id,model-version-id",container="collections",uriTemplate="/network/collections/collection/{collection-id}",requiredProps="collection-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="collection-id" type="xs:string">
+        <xs:element name="collection-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Collection Object UUID")</annox:annotate>
@@ -8012,46 +8012,46 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models",requiredProps="model-invariant-id,model-name-version-id,model-type,model-name,model-id,model-version")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string">
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-name-version-id" type="xs:string">
+        <xs:element name="model-name-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-type" type="xs:string">
+        <xs:element name="model-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-name" type="xs:string">
+        <xs:element name="model-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-id" type="xs:string">
+        <xs:element name="model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-version" type="xs:string">
+        <xs:element name="model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate>
@@ -8215,11 +8215,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true",requiredProps="vnf-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
index 363e988..1261cf4 100644 (file)
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
@@ -113,14 +113,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="relationship-key" type="xs:string">
+        <xs:element name="relationship-key" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate an attribute.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="relationship-value" type="xs:string">
+        <xs:element name="relationship-value" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Value of the attribute.")</annox:annotate>
@@ -200,25 +200,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks",uriTemplate="/oam-networks/oam-network/{network-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks",uriTemplate="/oam-networks/oam-network/{network-uuid}",requiredProps="network-uuid,network-name,cvlan-tag")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="network-uuid" type="xs:string">
+        <xs:element name="network-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of the network. Unique across a cloud-region")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="network-name" type="xs:string">
+        <xs:element name="network-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the network.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
+        <xs:element name="cvlan-tag" type="xs:unsignedInt" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="cvlan-id")</annox:annotate>
@@ -266,18 +266,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches",uriTemplate="/dvs-switches/dvs-switch/{switch-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches",uriTemplate="/dvs-switches/dvs-switch/{switch-name}",requiredProps="switch-name,vcenter-url")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="switch-name" type="xs:string">
+        <xs:element name="switch-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="DVS switch name")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vcenter-url" type="xs:string">
+        <xs:element name="vcenter-url" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL used to reach the vcenter")</annox:annotate>
@@ -311,18 +311,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones",uriTemplate="/availability-zones/availability-zone/{availability-zone-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones",uriTemplate="/availability-zones/availability-zone/{availability-zone-name}",requiredProps="availability-zone-name,hypervisor-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="availability-zone-name" type="xs:string">
+        <xs:element name="availability-zone-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the availability zone.  Unique across a cloud region")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="hypervisor-type" type="xs:string">
+        <xs:element name="hypervisor-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of hypervisor.  Source of truth should define valid values.")</annox:annotate>
@@ -401,11 +401,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team.")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team.",requiredProps="update-node-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="update-node-type" type="xs:string"/>
+        <xs:element name="update-node-type" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:update-node-key" minOccurs="0" maxOccurs="5000"/>
         <xs:element name="update-node-uri" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:action" minOccurs="0" maxOccurs="5000"/>
@@ -423,7 +423,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
   <xs:element name="notify">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="event-id" type="xs:string"/>
+        <xs:element name="event-id" type="xs:string" minOccurs="0"/>
         <xs:element name="node-type" type="xs:string" minOccurs="0"/>
         <xs:element name="event-trigger" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:key-data" minOccurs="0" maxOccurs="5000"/>
@@ -448,25 +448,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools",uriTemplate="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools",uriTemplate="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}",requiredProps="target-pe,availability-zone-name,ctag-pool-purpose")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="target-pe" type="xs:string">
+        <xs:element name="target-pe" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="The Target provider edge router")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="availability-zone-name" type="xs:string">
+        <xs:element name="availability-zone-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the availability zone")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="ctag-pool-purpose" type="xs:string">
+        <xs:element name="ctag-pool-purpose" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Describes what the intended purpose of this pool is.")</annox:annotate>
@@ -502,11 +502,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/complexes/complex/{physical-location-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/complexes/complex/{physical-location-id}",requiredProps="physical-location-id,physical-location-type,street1,city,postal-code,country,region")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="physical-location-id" type="xs:string">
+        <xs:element name="physical-location-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier for physical location, e.g., CLLI")</annox:annotate>
@@ -541,20 +541,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="physical-location-type" type="xs:string">
+        <xs:element name="physical-location-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type, e.g., central office, data center.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="street1" type="xs:string"/>
+        <xs:element name="street1" type="xs:string" minOccurs="0"/>
         <xs:element name="street2" type="xs:string" minOccurs="0"/>
-        <xs:element name="city" type="xs:string"/>
+        <xs:element name="city" type="xs:string" minOccurs="0"/>
         <xs:element name="state" type="xs:string" minOccurs="0"/>
-        <xs:element name="postal-code" type="xs:string"/>
-        <xs:element name="country" type="xs:string"/>
-        <xs:element name="region" type="xs:string"/>
+        <xs:element name="postal-code" type="xs:string" minOccurs="0"/>
+        <xs:element name="country" type="xs:string" minOccurs="0"/>
+        <xs:element name="region" type="xs:string" minOccurs="0"/>
         <xs:element name="latitude" type="xs:string" minOccurs="0"/>
         <xs:element name="longitude" type="xs:string" minOccurs="0"/>
         <xs:element name="elevation" type="xs:string" minOccurs="0"/>
@@ -580,11 +580,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups",uriTemplate="/volume-groups/volume-group/{volume-group-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups",uriTemplate="/volume-groups/volume-group/{volume-group-id}",requiredProps="volume-group-id,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="volume-group-id" type="xs:string">
+        <xs:element name="volume-group-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of volume-group.")</annox:annotate>
@@ -605,7 +605,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -660,18 +660,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes",uriTemplate="/volumes/volume/{volume-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes",uriTemplate="/volumes/volume/{volume-id}",requiredProps="volume-id,volume-selflink")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="volume-id" type="xs:string">
+        <xs:element name="volume-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of block storage volume relative to the vserver.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="volume-selflink" type="xs:string">
+        <xs:element name="volume-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -705,11 +705,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc,cp",uriTemplate="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc,cp",uriTemplate="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}",requiredProps="l3-interface-ipv4-address")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="l3-interface-ipv4-address" type="xs:string">
+        <xs:element name="l3-interface-ipv4-address" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
@@ -773,11 +773,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc,cp",uriTemplate="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc,cp",uriTemplate="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}",requiredProps="l3-interface-ipv6-address")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="l3-interface-ipv6-address" type="xs:string">
+        <xs:element name="l3-interface-ipv6-address" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
@@ -841,11 +841,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans",uriTemplate="/vlans/vlan/{vlan-interface}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans",uriTemplate="/vlans/vlan/{vlan-interface}",requiredProps="vlan-interface,in-maint,is-ip-unnumbered")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vlan-interface" type="xs:string">
+        <xs:element name="vlan-interface" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="String that identifies the interface")</annox:annotate>
@@ -960,11 +960,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs",uriTemplate="/sriov-vfs/sriov-vf/{pci-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs",uriTemplate="/sriov-vfs/sriov-vf/{pci-id}",requiredProps="pci-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="pci-id" type="xs:string">
+        <xs:element name="pci-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="PCI ID used to identify the sriov-vf")</annox:annotate>
@@ -1082,11 +1082,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface",container="l-interfaces",uriTemplate="/l-interfaces/l-interface/{interface-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface",container="l-interfaces",uriTemplate="/l-interfaces/l-interface/{interface-name}",requiredProps="interface-name,is-port-mirrored,in-maint,is-ip-unnumbered")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
+        <xs:element name="interface-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name given to the interface")</annox:annotate>
@@ -1223,18 +1223,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers",uriTemplate="/vservers/vserver/{vserver-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers",uriTemplate="/vservers/vserver/{vserver-id}",requiredProps="vserver-id,vserver-name,vserver-selflink,in-maint,is-closed-loop-disabled")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vserver-id" type="xs:string">
+        <xs:element name="vserver-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier for this vserver relative to its tenant")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vserver-name" type="xs:string">
+        <xs:element name="vserver-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of vserver")</annox:annotate>
@@ -1255,7 +1255,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vserver-selflink" type="xs:string">
+        <xs:element name="vserver-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -1305,25 +1305,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="nos-server is the execution environment that will have images, certain versions of VNOS, running on it.",indexedProps="nos-server-id",dependentOn="tenant",nameProps="nos-server-name",container="nos-servers",uriTemplate="/nos-servers/nos-server/{nos-server-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="nos-server is the execution environment that will have images, certain versions of VNOS, running on it.",indexedProps="nos-server-id",dependentOn="tenant",nameProps="nos-server-name",container="nos-servers",uriTemplate="/nos-servers/nos-server/{nos-server-id}",requiredProps="nos-server-id,nos-server-name,vendor,nos-server-selflink,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="nos-server-id" type="xs:string">
+        <xs:element name="nos-server-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier for this nos relative to its tenant")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="nos-server-name" type="xs:string">
+        <xs:element name="nos-server-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of nos")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vendor" type="xs:string">
+        <xs:element name="vendor" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="uCPE vendor")</annox:annotate>
@@ -1337,7 +1337,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="nos-server-selflink" type="xs:string">
+        <xs:element name="nos-server-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -1378,18 +1378,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id,tenant-context",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants",uriTemplate="/tenants/tenant/{tenant-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id,tenant-context",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants",uriTemplate="/tenants/tenant/{tenant-id}",requiredProps="tenant-id,tenant-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="tenant-id" type="xs:string">
+        <xs:element name="tenant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id relative to the cloud-region.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="tenant-name" type="xs:string">
+        <xs:element name="tenant-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Readable name of tenant")</annox:annotate>
@@ -1432,11 +1432,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="HPA Capability Feature attributes",indexedProps="hpa-attribute-key",dependentOn="hpa-capability")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="HPA Capability Feature attributes",indexedProps="hpa-attribute-key",dependentOn="hpa-capability",requiredProps="hpa-attribute-key")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="hpa-attribute-key" type="xs:string">
+        <xs:element name="hpa-attribute-key" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="name of the specific HPA attribute")</annox:annotate>
@@ -1465,18 +1465,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a HPA capability",indexedProps="hpa-feature,architecture,hpa-capability-id",dependentOn="flavor,cloud-region",container="hpa-capabilities")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a HPA capability",indexedProps="hpa-feature,architecture,hpa-capability-id",dependentOn="flavor,cloud-region",container="hpa-capabilities",requiredProps="hpa-capability-id,hpa-feature")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="hpa-capability-id" type="xs:string">
+        <xs:element name="hpa-capability-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID to uniquely identify a HPA capability")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="hpa-feature" type="xs:string">
+        <xs:element name="hpa-feature" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the HPACapability")</annox:annotate>
@@ -1525,18 +1525,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors",uriTemplate="/flavors/flavor/{flavor-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors",uriTemplate="/flavors/flavor/{flavor-id}",requiredProps="flavor-id,flavor-name,flavor-selflink")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="flavor-id" type="xs:string">
+        <xs:element name="flavor-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Flavor id, expected to be unique across cloud-region.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="flavor-name" type="xs:string">
+        <xs:element name="flavor-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Cloud Region Flavor name")</annox:annotate>
@@ -1585,7 +1585,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="flavor-selflink" type="xs:string">
+        <xs:element name="flavor-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -1633,25 +1633,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments",uriTemplate="/group-assignments/group-assignment/{group-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments",uriTemplate="/group-assignments/group-assignment/{group-id}",requiredProps="group-id,group-type,group-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="group-id" type="xs:string">
+        <xs:element name="group-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Group id, expected to be unique across cloud-region.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="group-type" type="xs:string">
+        <xs:element name="group-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group type - the type of group this instance refers to")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="group-name" type="xs:string">
+        <xs:element name="group-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group name - name assigned to the group")</annox:annotate>
@@ -1692,11 +1692,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots",uriTemplate="/snapshots/snapshot/{snapshot-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots",uriTemplate="/snapshots/snapshot/{snapshot-id}",requiredProps="snapshot-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="snapshot-id" type="xs:string">
+        <xs:element name="snapshot-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Snapshot id, this is the key UUID assoc associated in glance with the snapshots.")</annox:annotate>
@@ -1793,18 +1793,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata",uriTemplate="/metadata/metadatum/{metaname}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata",uriTemplate="/metadata/metadatum/{metaname}",requiredProps="metaname,metaval")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="metaname" type="xs:string">
+        <xs:element name="metaname" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="metaval" type="xs:string"/>
+        <xs:element name="metaval" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -1831,18 +1831,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images",uriTemplate="/images/image/{image-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images",uriTemplate="/images/image/{image-id}",requiredProps="image-id,image-name,image-os-distro,image-os-version,image-selflink")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="image-id" type="xs:string">
+        <xs:element name="image-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Image id, expected to be unique across cloud region")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-name" type="xs:string">
+        <xs:element name="image-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Image name")</annox:annotate>
@@ -1856,14 +1856,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-os-distro" type="xs:string">
+        <xs:element name="image-os-distro" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-os-version" type="xs:string">
+        <xs:element name="image-os-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The operating system version as specified by the distributor.")</annox:annotate>
@@ -1891,7 +1891,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-selflink" type="xs:string">
+        <xs:element name="image-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -1938,11 +1938,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv4-address-list/{vip-ipv4-address}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv4-address-list/{vip-ipv4-address}",requiredProps="vip-ipv4-address")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vip-ipv4-address" type="xs:string">
+        <xs:element name="vip-ipv4-address" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
@@ -2006,11 +2006,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv6-address-list/{vip-ipv6-address}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv6-address-list/{vip-ipv6-address}",requiredProps="vip-ipv6-address")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vip-ipv6-address" type="xs:string">
+        <xs:element name="vip-ipv6-address" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
@@ -2074,11 +2074,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist common address information of external systems.",indexedProps="esr-system-info-id,system-name,system-type",searchable="esr-system-info-id,system-name,system-type",container="esr-system-info-list",dependentOn="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc,ext-aai-network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist common address information of external systems.",indexedProps="esr-system-info-id,system-name,system-type",searchable="esr-system-info-id,system-name,system-type",container="esr-system-info-list",dependentOn="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc,ext-aai-network",requiredProps="esr-system-info-id,user-name,password,system-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="esr-system-info-id" type="xs:string">
+        <xs:element name="esr-system-info-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of esr system info.")</annox:annotate>
@@ -2120,21 +2120,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="user-name" type="xs:string">
+        <xs:element name="user-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="username used to access external systems.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="password" type="xs:string">
+        <xs:element name="password" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="password used to access external systems.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="system-type" type="xs:string">
+        <xs:element name="system-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="it could be vim/vnfm/thirdparty-sdnc/ems-resource/ems-performance/ems-alarm.")</annox:annotate>
@@ -2245,18 +2245,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&amp;T's AIC.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&amp;T's AIC.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}",requiredProps="cloud-owner,cloud-region-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="cloud-owner" type="xs:string">
+        <xs:element name="cloud-owner" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="cloud-region-id" type="xs:string">
+        <xs:element name="cloud-region-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifier used by the vendor for the region. Second part of composite key")</annox:annotate>
@@ -2365,11 +2365,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}",requiredProps="nm-profile-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="nm-profile-name" type="xs:string">
+        <xs:element name="nm-profile-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique name of network profile.")</annox:annotate>
@@ -2410,11 +2410,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Physical Function",indexedProps="pf-pci-id",dependentOn="p-interface",container="sriov-pfs",uriTemplate="/sriov-pfs/sriov-pf/{pf-pci-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Physical Function",indexedProps="pf-pci-id",dependentOn="p-interface",container="sriov-pfs",uriTemplate="/sriov-pfs/sriov-pf/{pf-pci-id}",requiredProps="pf-pci-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="pf-pci-id" type="xs:string">
+        <xs:element name="pf-pci-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifier for the sriov-pf")</annox:annotate>
@@ -2448,11 +2448,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,networkRef,operational-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,networkRef,operational-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
+        <xs:element name="interface-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name that identifies the physical interface")</annox:annotate>
@@ -2586,11 +2586,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces",uriTemplate="/lag-interfaces/lag-interface/{interface-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces",uriTemplate="/lag-interfaces/lag-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
+        <xs:element name="interface-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name that identifies the link aggregate interface")</annox:annotate>
@@ -2674,11 +2674,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="HPA Capacity information for compute node",indexedProps="hpa-capacity-key",dependentOn="hpa-capacity")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="HPA Capacity information for compute node",indexedProps="hpa-capacity-key",dependentOn="hpa-capacity",requiredProps="hpa-capacity-key")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="hpa-capacity-key" type="xs:string">
+        <xs:element name="hpa-capacity-key" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Composite key formed with hpaFeature and append list of hpaFeatureAttributes needed for capacity check")</annox:annotate>
@@ -2707,11 +2707,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",uniqueProps="hostname",container="pservers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/pservers/pserver/{hostname}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",uniqueProps="hostname",container="pservers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/pservers/pserver/{hostname}",requiredProps="hostname,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="hostname" type="xs:string">
+        <xs:element name="hostname" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Value from executing hostname on the compute node.")</annox:annotate>
@@ -2923,18 +2923,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}",requiredProps="vdc-id,vdc-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vdc-id" type="xs:string">
+        <xs:element name="vdc-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vdc")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vdc-name" type="xs:string">
+        <xs:element name="vdc-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the virtual data center")</annox:annotate>
@@ -2968,46 +2968,46 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="It is a logical partition of the cloud which allows to have multiple environments in the production AIC.",indexedProps="operational-environment-id",nameProps="operational-environment-name",uniqueProps="operational-environment-id",container="operational-environments",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/operational-environments/operational-environment/{operational-environment-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="It is a logical partition of the cloud which allows to have multiple environments in the production AIC.",indexedProps="operational-environment-id",nameProps="operational-environment-name",uniqueProps="operational-environment-id",container="operational-environments",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/operational-environments/operational-environment/{operational-environment-id}",requiredProps="operational-environment-id,operational-environment-name,operational-environment-type,operational-environment-status,tenant-context,workload-context")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="operational-environment-id" type="xs:string">
+        <xs:element name="operational-environment-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of an operational environment")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="operational-environment-name" type="xs:string">
+        <xs:element name="operational-environment-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operational Environment name")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="operational-environment-type" type="xs:string">
+        <xs:element name="operational-environment-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operational Environment Type.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="operational-environment-status" type="xs:string">
+        <xs:element name="operational-environment-status" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Status")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="tenant-context" type="xs:string">
+        <xs:element name="tenant-context" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Tenant Context.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="workload-context" type="xs:string">
+        <xs:element name="workload-context" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Workload Context.")</annox:annotate>
@@ -3041,18 +3041,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="The network-technology object is used to capture the supported network technologies of a cloud-region.",nameProps="network-technology-id,network-technology-name",uniqueProps="network-technology-id",container="network-technologies",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-technologies/network-technology/{network-technology-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="The network-technology object is used to capture the supported network technologies of a cloud-region.",nameProps="network-technology-id,network-technology-name",uniqueProps="network-technology-id",container="network-technologies",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-technologies/network-technology/{network-technology-id}",requiredProps="network-technology-id,network-technology-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="network-technology-id" type="xs:string">
+        <xs:element name="network-technology-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier of the network-technology object (UUID)")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="network-technology-name" type="xs:string">
+        <xs:element name="network-technology-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The network-technology  that a cloud-region can support. Current valid values- CONTRAIL AIC_SR_IOV OVS STANDARD-SR-IOV")</annox:annotate>
@@ -3104,11 +3104,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist EMS address information used by EMS driver.",indexedProps="ems-id",searchable="ems-id",container="esr-ems-list",namespace="external-system")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist EMS address information used by EMS driver.",indexedProps="ems-id",searchable="ems-id",container="esr-ems-list",namespace="external-system",requiredProps="ems-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="ems-id" type="xs:string">
+        <xs:element name="ems-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of EMS.")</annox:annotate>
@@ -3143,11 +3143,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist VNFM address information used by VF-C.",indexedProps="vnfm-id",searchable="vnfm-id",container="esr-vnfm-list",namespace="external-system")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist VNFM address information used by VF-C.",indexedProps="vnfm-id",searchable="vnfm-id",container="esr-vnfm-list",namespace="external-system",requiredProps="vnfm-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnfm-id" type="xs:string">
+        <xs:element name="vnfm-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of VNFM.")</annox:annotate>
@@ -3196,11 +3196,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="thirdparty-sdnc-id" type="xs:string">
+        <xs:element name="thirdparty-sdnc-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of SDNC.")</annox:annotate>
@@ -3263,11 +3263,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business",uriTemplate="/business/connectors/connector/{resource-instance-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business",uriTemplate="/business/connectors/connector/{resource-instance-id}",requiredProps="resource-instance-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="resource-instance-id" type="xs:string">
+        <xs:element name="resource-instance-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of resource instance.")</annox:annotate>
@@ -3330,11 +3330,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects",uriTemplate="/tunnel-xconnects/tunnel-xconnect/{id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects",uriTemplate="/tunnel-xconnects/tunnel-xconnect/{id}",requiredProps="id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="id" type="xs:string">
+        <xs:element name="id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
@@ -3368,11 +3368,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description,allotted-resource-name",uniqueProps="id",indexedProps="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",dependentOn="service-instance",container="allotted-resources",uriTemplate="/allotted-resources/allotted-resource/{id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description,allotted-resource-name",uniqueProps="id",indexedProps="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",dependentOn="service-instance",container="allotted-resources",uriTemplate="/allotted-resources/allotted-resource/{id}",requiredProps="id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="id" type="xs:string">
+        <xs:element name="id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
@@ -3519,11 +3519,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}",requiredProps="service-instance-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-instance-id" type="xs:string">
+        <xs:element name="service-instance-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this instance of a service")</annox:annotate>
@@ -3692,11 +3692,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type",uriTemplate="/service-subscriptions/service-subscription/{service-type}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type",uriTemplate="/service-subscriptions/service-subscription/{service-type}",requiredProps="service-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
+        <xs:element name="service-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Value defined by orchestration to identify this service across ECOMP.")</annox:annotate>
@@ -3738,25 +3738,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business",uriTemplate="/business/customers/customer/{global-customer-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business",uriTemplate="/business/customers/customer/{global-customer-id}",requiredProps="global-customer-id,subscriber-name,subscriber-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="global-customer-id" type="xs:string">
+        <xs:element name="global-customer-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Global customer id used across ECOMP to uniquely identify customer.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="subscriber-name" type="xs:string">
+        <xs:element name="subscriber-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Subscriber name, an alternate way to retrieve a customer.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="subscriber-type" type="xs:string">
+        <xs:element name="subscriber-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Subscriber type, a way to provide VID with only the INFRA customers.",defaultValue="CUST")</annox:annotate>
@@ -3791,11 +3791,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a line-of-business",indexedProps="line-of-business-name",uniqueProps="line-of-business-name",container="lines-of-business",namespace="business",uriTemplate="/business/lines-of-business/line-of-business/{line-of-business-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a line-of-business",indexedProps="line-of-business-name",uniqueProps="line-of-business-name",container="lines-of-business",namespace="business",uriTemplate="/business/lines-of-business/line-of-business/{line-of-business-name}",requiredProps="line-of-business-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="line-of-business-name" type="xs:string">
+        <xs:element name="line-of-business-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the line-of-business (product)")</annox:annotate>
@@ -3829,18 +3829,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes an owning-entity",indexedProps="owning-entity-id,owning-entity-name",searchable="owning-entity-id",uniqueProps="owning-entity-id,owning-entity-name",container="owning-entities",namespace="business",uriTemplate="/business/owning-entities/owning-entity/{owning-entity-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes an owning-entity",indexedProps="owning-entity-id,owning-entity-name",searchable="owning-entity-id",uniqueProps="owning-entity-id,owning-entity-name",container="owning-entities",namespace="business",uriTemplate="/business/owning-entities/owning-entity/{owning-entity-id}",requiredProps="owning-entity-id,owning-entity-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="owning-entity-id" type="xs:string">
+        <xs:element name="owning-entity-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of an owning entity")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="owning-entity-name" type="xs:string">
+        <xs:element name="owning-entity-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Owning entity name")</annox:annotate>
@@ -3874,11 +3874,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a platform",indexedProps="platform-name",uniqueProps="platform-name",container="platforms",namespace="business",uriTemplate="/business/platforms/platform/{platform-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a platform",indexedProps="platform-name",uniqueProps="platform-name",container="platforms",namespace="business",uriTemplate="/business/platforms/platform/{platform-name}",requiredProps="platform-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="platform-name" type="xs:string">
+        <xs:element name="platform-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the platform")</annox:annotate>
@@ -3912,11 +3912,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes the project",indexedProps="project-name",uniqueProps="project-name",container="projects",namespace="business",uriTemplate="/business/projects/project/{project-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes the project",indexedProps="project-name",uniqueProps="project-name",container="projects",namespace="business",uriTemplate="/business/projects/project/{project-name}",requiredProps="project-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="project-name" type="xs:string">
+        <xs:element name="project-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the project deploying a service")</annox:annotate>
@@ -3950,11 +3950,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an sp-partner",indexedProps="sp-partner-id,url,callsource",nameProps="sp-partner-id",searchable="sp-partner-id",uniqueProps="sp-partner-id",container="sp-partners",namespace="business",uriTemplate="/business/sp-partners/sp-partner/{sp-partner-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an sp-partner",indexedProps="sp-partner-id,url,callsource",nameProps="sp-partner-id",searchable="sp-partner-id",uniqueProps="sp-partner-id",container="sp-partners",namespace="business",uriTemplate="/business/sp-partners/sp-partner/{sp-partner-id}",requiredProps="sp-partner-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="sp-partner-id" type="xs:string">
+        <xs:element name="sp-partner-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this sp-partner by id")</annox:annotate>
@@ -4048,25 +4048,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}",requiredProps="vnf-image-uuid,application,application-vendor")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-image-uuid" type="xs:string">
+        <xs:element name="vnf-image-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of this asset")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="application" type="xs:string">
+        <xs:element name="application" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="application-vendor" type="xs:string">
+        <xs:element name="application-vendor" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
@@ -4114,18 +4114,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/services/service/{service-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/services/service/{service-id}",requiredProps="service-id,service-description")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-id" type="xs:string">
+        <xs:element name="service-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="service-description" type="xs:string">
+        <xs:element name="service-description" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Description of the service")</annox:annotate>
@@ -4173,18 +4173,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}",requiredProps="service-type,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
+        <xs:element name="service-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -4218,18 +4218,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets",uriTemplate="/element-choice-sets/element-choice-set/{element-choice-set-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets",uriTemplate="/element-choice-sets/element-choice-set/{element-choice-set-uuid}",requiredProps="element-choice-set-uuid,element-choice-set-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="element-choice-set-uuid" type="xs:string">
+        <xs:element name="element-choice-set-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="element-choice-set-name" type="xs:string"/>
+        <xs:element name="element-choice-set-name" type="xs:string" minOccurs="0"/>
         <xs:element name="cardinality" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:model-elements" minOccurs="0"/>
@@ -4248,19 +4248,19 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets",uriTemplate="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets",uriTemplate="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}",requiredProps="constrained-element-set-uuid,constraint-type,check-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="constrained-element-set-uuid" type="xs:string">
+        <xs:element name="constrained-element-set-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="check-type" type="xs:string"/>
+        <xs:element name="constraint-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="check-type" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:element-choice-sets" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -4278,18 +4278,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints",uriTemplate="/model-constraints/model-constraint/{model-constraint-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints",uriTemplate="/model-constraints/model-constraint/{model-constraint-uuid}",requiredProps="model-constraint-uuid,constrained-element-set-uuid-to-replace")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-constraint-uuid" type="xs:string">
+        <xs:element name="model-constraint-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string"/>
+        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:constrained-element-sets" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
@@ -4312,25 +4312,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements",uriTemplate="/model-elements/model-element/{model-element-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements",uriTemplate="/model-elements/model-element/{model-element-uuid}",requiredProps="model-element-uuid,new-data-del-flag,cardinality")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-element-uuid" type="xs:string">
+        <xs:element name="model-element-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="new-data-del-flag" type="xs:string">
+        <xs:element name="new-data-del-flag" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates whether this element was created as part of instantiation from this model")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="cardinality" type="xs:string">
+        <xs:element name="cardinality" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="How many of this type of element are required/allowed")</annox:annotate>
@@ -4374,25 +4374,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version,distribution-status",uniqueProps="model-version-id",container="model-vers",uriTemplate="/model-vers/model-ver/{model-version-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version,distribution-status",uniqueProps="model-version-id",container="model-vers",uriTemplate="/model-vers/model-ver/{model-version-id}",requiredProps="model-version-id,model-name,model-version")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-version-id" type="xs:string">
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-name" type="xs:string">
+        <xs:element name="model-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-version" type="xs:string">
+        <xs:element name="model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate>
@@ -4437,18 +4437,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/models/model/{model-invariant-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/models/model/{model-invariant-id}",requiredProps="model-invariant-id,model-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string">
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-type" type="xs:string">
+        <xs:element name="model-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>
@@ -4483,21 +4483,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups",requiredProps="related-lookup-uuid,source-node-type,source-node-property,target-node-type,target-node-property")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="related-lookup-uuid" type="xs:string">
+        <xs:element name="related-lookup-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="source-node-type" type="xs:string"/>
-        <xs:element name="source-node-property" type="xs:string"/>
-        <xs:element name="target-node-type" type="xs:string"/>
-        <xs:element name="target-node-property" type="xs:string"/>
+        <xs:element name="source-node-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="source-node-property" type="xs:string" minOccurs="0"/>
+        <xs:element name="target-node-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="target-node-property" type="xs:string" minOccurs="0"/>
         <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="5000"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -4515,20 +4515,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints",requiredProps="property-constraint-uuid,constraint-type,property-name,property-value")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="property-constraint-uuid" type="xs:string">
+        <xs:element name="property-constraint-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="property-name" type="xs:string"/>
-        <xs:element name="property-value" type="xs:string"/>
+        <xs:element name="constraint-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
@@ -4544,11 +4544,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements",requiredProps="named-query-element-uuid")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="named-query-element-uuid" type="xs:string">
+        <xs:element name="named-query-element-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
@@ -4577,19 +4577,19 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation",requiredProps="named-query-uuid,named-query-name,named-query-version")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="named-query-uuid" type="xs:string">
+        <xs:element name="named-query-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="named-query-name" type="xs:string"/>
-        <xs:element name="named-query-version" type="xs:string"/>
+        <xs:element name="named-query-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="named-query-version" type="xs:string" minOccurs="0"/>
         <xs:element name="required-input-params" minOccurs="0">
           <xs:complexType>
             <xs:sequence>
@@ -4631,11 +4631,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose,operational-status",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",uriTemplate="/network/logical-links/logical-link/{link-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose,operational-status",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",uriTemplate="/network/logical-links/logical-link/{link-name}",requiredProps="link-name,in-maint,link-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
+        <xs:element name="link-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ")</annox:annotate>
@@ -4649,7 +4649,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="link-type" type="xs:string">
+        <xs:element name="link-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of logical link, e.g., evc")</annox:annotate>
@@ -4792,7 +4792,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="cos" type="xs:string">
+        <xs:element name="cos" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
@@ -4844,7 +4844,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="site-pair-id" type="xs:string">
+        <xs:element name="site-pair-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
@@ -4918,7 +4918,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="routing-instance-id" type="xs:string">
+        <xs:element name="routing-instance-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of routing instance")</annox:annotate>
@@ -4960,11 +4960,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network",uriTemplate="/network/site-pair-sets/site-pair-set/{site-pair-set-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network",uriTemplate="/network/site-pair-sets/site-pair-set/{site-pair-set-id}",requiredProps="site-pair-set-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="site-pair-set-id" type="xs:string">
+        <xs:element name="site-pair-set-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of site pair set.")</annox:annotate>
@@ -4999,18 +4999,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true",uriTemplate="/route-targets/route-target/{global-route-target}/{route-target-role}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true",uriTemplate="/route-targets/route-target/{global-route-target}/{route-target-role}",requiredProps="global-route-target,route-target-role")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="global-route-target" type="xs:string">
+        <xs:element name="global-route-target" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Number used to identify an RT, globally unique in the network")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="route-target-role" type="xs:string">
+        <xs:element name="route-target-role" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Role assigned to this route target")</annox:annotate>
@@ -5044,18 +5044,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="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",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="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",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}",requiredProps="vpn-id,vpn-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vpn-id" type="xs:string">
+        <xs:element name="vpn-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="VPN ID, globally unique within A&amp;AI")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vpn-name" type="xs:string">
+        <xs:element name="vpn-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VPN Name")</annox:annotate>
@@ -5203,11 +5203,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network",uriTemplate="/network/vpls-pes/vpls-pe/{equipment-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network",uriTemplate="/network/vpls-pes/vpls-pe/{equipment-name}",requiredProps="equipment-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="equipment-name" type="xs:string">
+        <xs:element name="equipment-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
@@ -5275,21 +5275,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="multicast-configuration-id" type="xs:string">
+        <xs:element name="multicast-configuration-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of multicast configuration.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="multicast-protocol" type="xs:string">
+        <xs:element name="multicast-protocol" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="protocol of multicast configuration")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="rp-type" type="xs:string">
+        <xs:element name="rp-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="rp type of multicast configuration")</annox:annotate>
@@ -5327,7 +5327,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
+        <xs:element name="cvlan-tag" type="xs:unsignedInt" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="See mis-na-virtualization-platform.yang")</annox:annotate>
@@ -5356,11 +5356,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-id" type="xs:string">
+        <xs:element name="interface-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the interface")</annox:annotate>
@@ -5416,7 +5416,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="orchestration-status" type="xs:string">
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
@@ -5453,18 +5453,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}",requiredProps="group-uuid,resource-uuid")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
+        <xs:element name="group-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the license group the resource belongs to, should be uuid.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
+        <xs:element name="resource-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of a license resource. ")</annox:annotate>
@@ -5498,18 +5498,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements",uriTemplate="/entitlements/entitlement/{group-uuid}/{resource-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements",uriTemplate="/entitlements/entitlement/{group-uuid}/{resource-uuid}",requiredProps="group-uuid,resource-uuid")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
+        <xs:element name="group-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the entitlement group the resource comes from, should be uuid.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
+        <xs:element name="resource-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of an entitlement resource. ")</annox:annotate>
@@ -5543,18 +5543,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
@@ -5568,7 +5568,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -5703,11 +5703,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="point of attachment from services or resources to a virtual link or network.",uniqueProps="cp-instance-id",dependentOn="vnfc",container="cps",uriTemplate="/cps/cp/{cp-instance-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="point of attachment from services or resources to a virtual link or network.",uniqueProps="cp-instance-id",dependentOn="vnfc",container="cps",uriTemplate="/cps/cp/{cp-instance-id}",requiredProps="cp-instance-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="cp-instance-id" type="xs:string">
+        <xs:element name="cp-instance-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the connection point.")</annox:annotate>
@@ -5754,21 +5754,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnfc-name" type="xs:string">
+        <xs:element name="vnfc-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of vnfc.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="nfc-naming-code" type="xs:string">
+        <xs:element name="nfc-naming-code" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Short code that is used in naming instances of the item being modeled")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="nfc-function" type="xs:string">
+        <xs:element name="nfc-function" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service")</annox:annotate>
@@ -5872,21 +5872,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="host-route-id" type="xs:string">
+        <xs:element name="host-route-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="host-route id")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="route-prefix" type="xs:string">
+        <xs:element name="route-prefix" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="subnet prefix")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="next-hop" type="xs:string">
+        <xs:element name="next-hop" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Could be ip-address, hostname, or service-instance")</annox:annotate>
@@ -5926,7 +5926,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="subnet-id" type="xs:string">
+        <xs:element name="subnet-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Subnet ID, should be UUID.")</annox:annotate>
@@ -6051,7 +6051,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt">
+        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="id.")</annox:annotate>
@@ -6080,11 +6080,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments",uriTemplate="/segmentation-assignments/segmentation-assignment/{segmentation-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments",uriTemplate="/segmentation-assignments/segmentation-assignment/{segmentation-id}",requiredProps="segmentation-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="segmentation-id" type="xs:string">
+        <xs:element name="segmentation-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
@@ -6118,11 +6118,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="network-id" type="xs:string">
+        <xs:element name="network-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Network ID, should be uuid. Unique across A&amp;AI.")</annox:annotate>
@@ -6339,7 +6339,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="network-policy-id" type="xs:string">
+        <xs:element name="network-policy-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID representing unique key to this instance")</annox:annotate>
@@ -6382,11 +6382,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules",uriTemplate="/vf-modules/vf-module/{vf-module-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules",uriTemplate="/vf-modules/vf-module/{vf-module-id}",requiredProps="vf-module-id,is-base-vf-module,automated-assignment")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vf-module-id" type="xs:string">
+        <xs:element name="vf-module-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of vf-module.")</annox:annotate>
@@ -6518,11 +6518,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role",searchable="vnf-id,vnf-name,vnf-name2,operational-status",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs",uriTemplate="/network/generic-vnfs/generic-vnf/{vnf-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role",searchable="vnf-id,vnf-name,vnf-name2,operational-status",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs",uriTemplate="/network/generic-vnfs/generic-vnf/{vnf-id}",requiredProps="vnf-id,vnf-type,in-maint,is-closed-loop-disabled")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
@@ -6550,7 +6550,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -6946,11 +6946,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network",uriTemplate="/network/lag-links/lag-link/{link-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network",uriTemplate="/network/lag-links/lag-link/{link-name}",requiredProps="link-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
+        <xs:element name="link-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Alphabetical concatenation of lag-interface names")</annox:annotate>
@@ -6984,18 +6984,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network",uriTemplate="/network/newvces/newvce/{vnf-id2}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network",uriTemplate="/network/newvces/newvce/{vnf-id2}",requiredProps="vnf-id2,vnf-name,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id2" type="xs:string">
+        <xs:element name="vnf-id2" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF, can't use same attribute name right now until we promote this new object")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
@@ -7009,7 +7009,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -7107,11 +7107,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="softwareVersionId,isActiveSwVer",dependentOn="pnf",container="pnf")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="softwareVersionId,isActiveSwVer",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="software-version-id" type="xs:string">
+        <xs:element name="software-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifier of the software version")</annox:annotate>
@@ -7144,11 +7144,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id,operational-status,admin-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id,operational-status,admin-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="pnf-name" type="xs:string">
+        <xs:element name="pnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique name of Physical Network Function.")</annox:annotate>
@@ -7381,11 +7381,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id",uriTemplate="/network/physical-links/physical-link/{link-name}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id",uriTemplate="/network/physical-links/physical-link/{link-name}",requiredProps="link-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
+        <xs:element name="link-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ")</annox:annotate>
@@ -7489,11 +7489,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers",uriTemplate="/vig-servers/vig-server/{vig-address-type}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers",uriTemplate="/vig-servers/vig-server/{vig-address-type}",requiredProps="vig-address-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vig-address-type" type="xs:string">
+        <xs:element name="vig-address-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="indicates whether the VIG is for AVPN or INTERNET")</annox:annotate>
@@ -7536,11 +7536,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network",uriTemplate="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network",uriTemplate="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}",requiredProps="ipsec-configuration-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="ipsec-configuration-id" type="xs:string">
+        <xs:element name="ipsec-configuration-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of this configuration")</annox:annotate>
@@ -7710,18 +7710,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network",uriTemplate="/network/route-table-references/route-table-reference/{route-table-reference-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network",uriTemplate="/network/route-table-references/route-table-reference/{route-table-reference-id}",requiredProps="route-table-reference-id,route-table-reference-fqdn")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="route-table-reference-id" type="xs:string">
+        <xs:element name="route-table-reference-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="route-table-reference-fqdn" type="xs:string">
+        <xs:element name="route-table-reference-fqdn" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="FQDN entry in the route table.")</annox:annotate>
@@ -7755,11 +7755,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,description,instance-group-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="id" type="xs:string">
+        <xs:element name="id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Instance Group ID, UUID assigned to this instance.")</annox:annotate>
@@ -7787,14 +7787,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="description" type="xs:string">
+        <xs:element name="description" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Descriptive text to help identify the usage of this instance-group")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="instance-group-type" type="xs:string">
+        <xs:element name="instance-group-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability")</annox:annotate>
@@ -7842,32 +7842,32 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network",uriTemplate="/network/zones/zone/{zone-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network",uriTemplate="/network/zones/zone/{zone-id}",requiredProps="zone-id,zone-name,design-type,zone-context")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="zone-id" type="xs:string">
+        <xs:element name="zone-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Code assigned by AIC to the zone")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="zone-name" type="xs:string">
+        <xs:element name="zone-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="English name associated with the zone")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="design-type" type="xs:string">
+        <xs:element name="design-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Design of zone [Medium/Large…]")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="zone-context" type="xs:string">
+        <xs:element name="zone-context" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Context of zone [production/test]")</annox:annotate>
@@ -7908,11 +7908,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vlan-mapping object is an optional child object of the forwarder-evc object.  A given forwarder-evc object may have multiple vlan-mapping objects.",dependentOn="forwarder-evc",uniqueProps="vlan-mapping-id",container="vlan-mappings",uriTemplate="/vlan-mappings/vlan-mapping/{vlan-mapping-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vlan-mapping object is an optional child object of the forwarder-evc object.  A given forwarder-evc object may have multiple vlan-mapping objects.",dependentOn="forwarder-evc",uniqueProps="vlan-mapping-id",container="vlan-mappings",uriTemplate="/vlan-mappings/vlan-mapping/{vlan-mapping-id}",requiredProps="vlan-mapping-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vlan-mapping-id" type="xs:string">
+        <xs:element name="vlan-mapping-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Key for vlan-mapping object.")</annox:annotate>
@@ -7968,11 +7968,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="forwarder object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="forwarder-evc-id",container="forwarder-evcs",uriTemplate="/forwarder-evcs/forwarder-evc/{forwarder-evc-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="forwarder object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="forwarder-evc-id",container="forwarder-evcs",uriTemplate="/forwarder-evcs/forwarder-evc/{forwarder-evc-id}",requiredProps="forwarder-evc-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="forwarder-evc-id" type="xs:string">
+        <xs:element name="forwarder-evc-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Key for forwarder-evc object")</annox:annotate>
@@ -8030,11 +8030,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="evc object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="evc-id",container="evcs",uriTemplate="/evcs/evc/{evc-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="evc object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="evc-id",container="evcs",uriTemplate="/evcs/evc/{evc-id}",requiredProps="evc-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="evc-id" type="xs:string">
+        <xs:element name="evc-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique/key field for the evc object")</annox:annotate>
@@ -8154,11 +8154,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic configuration object.",indexedProps="configuration-id,model-invariant-id,model-version-id",uniqueProps="configuration-id",container="configurations",namespace="network",uriTemplate="/network/configurations/configuration/{configuration-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic configuration object.",indexedProps="configuration-id,model-invariant-id,model-version-id",uniqueProps="configuration-id",container="configurations",namespace="network",uriTemplate="/network/configurations/configuration/{configuration-id}",requiredProps="configuration-id,configuration-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="configuration-id" type="xs:string">
+        <xs:element name="configuration-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID assigned to configuration.")</annox:annotate>
@@ -8179,7 +8179,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="configuration-type" type="xs:string">
+        <xs:element name="configuration-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="port-mirroring-configuration.")</annox:annotate>
@@ -8286,11 +8286,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="sequence",description="Entity describing a sequenced segment of forwarding path",container="forwarders",dependentOn="forwarding-path",uriTemplate="/forwarders/forwarder/{sequence}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="sequence",description="Entity describing a sequenced segment of forwarding path",container="forwarders",dependentOn="forwarding-path",uriTemplate="/forwarders/forwarder/{sequence}",requiredProps="sequence")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="sequence" type="xs:int">
+        <xs:element name="sequence" type="xs:int" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of this segmentation")</annox:annotate>
@@ -8326,18 +8326,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",indexedProps="forwarding-path-id,forwarding-path-name",description="Entity that describes the sequenced forwarding path between interfaces of services or resources",container="forwarding-paths",nameProps="forwarding-path-name",uniqueProps="forwarding-path-id",uriTemplate="/network/forwarding-paths/forwarding-path/{forwarding-path-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",indexedProps="forwarding-path-id,forwarding-path-name",description="Entity that describes the sequenced forwarding path between interfaces of services or resources",container="forwarding-paths",nameProps="forwarding-path-name",uniqueProps="forwarding-path-id",uriTemplate="/network/forwarding-paths/forwarding-path/{forwarding-path-id}",requiredProps="forwarding-path-id,forwarding-path-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="forwarding-path-id" type="xs:string">
+        <xs:element name="forwarding-path-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of this FP")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="forwarding-path-name" type="xs:string">
+        <xs:element name="forwarding-path-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the FP")</annox:annotate>
@@ -8374,11 +8374,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",description="represents the collection resource in the TOSCA model",uniqueProps="collection-id",indexedProps="collection-id,model-invariant-id,model-version-id",container="collections",uriTemplate="/network/collections/collection/{collection-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",description="represents the collection resource in the TOSCA model",uniqueProps="collection-id",indexedProps="collection-id,model-invariant-id,model-version-id",container="collections",uriTemplate="/network/collections/collection/{collection-id}",requiredProps="collection-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="collection-id" type="xs:string">
+        <xs:element name="collection-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Collection Object UUID")</annox:annotate>
@@ -8467,14 +8467,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vlan-tag-id" type="xs:string">
+        <xs:element name="vlan-tag-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vlan-tag")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vlan-tag-role" type="xs:string">
+        <xs:element name="vlan-tag-role" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="purpose (l3-network to be connected to)")</annox:annotate>
@@ -8488,7 +8488,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:int">
+        <xs:element name="vlan-id-outer" type="xs:int" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN outer id")</annox:annotate>
@@ -8524,11 +8524,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a connectivity",indexedProps="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",nameProps="etht-svc-name",searchable="connectivity-id",uniqueProps="connectivity-id",container="connectivities",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a connectivity",indexedProps="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",nameProps="etht-svc-name",searchable="connectivity-id",uniqueProps="connectivity-id",container="connectivities",namespace="network",requiredProps="connectivity-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="connectivity-id" type="xs:string">
+        <xs:element name="connectivity-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this connectivity by id")</annox:annotate>
@@ -8702,11 +8702,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a dhcp-service",indexedProps="dhcp-service-id,dhcp-service-type,domain-name,server-ipv4-address,server-ipv6-address",nameProps="domain-name",searchable="dhcp-service-id",uniqueProps="dhcp-service-id",container="dhcp-services",dependentOn="lan-port-config",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a dhcp-service",indexedProps="dhcp-service-id,dhcp-service-type,domain-name,server-ipv4-address,server-ipv6-address",nameProps="domain-name",searchable="dhcp-service-id",uniqueProps="dhcp-service-id",container="dhcp-services",dependentOn="lan-port-config",namespace="network",requiredProps="dhcp-service-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="dhcp-service-id" type="xs:string">
+        <xs:element name="dhcp-service-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this dhcp-service by id")</annox:annotate>
@@ -8810,11 +8810,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a lan-port-config",indexedProps="lan-port-config-id,lan-port-config-name,device-id,port-id,ipv4-address,ipv6-address,vlan-tag",nameProps="lan-port-config-name",searchable="lan-port-config-id",uniqueProps="lan-port-config-id",container="lan-port-configs",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a lan-port-config",indexedProps="lan-port-config-id,lan-port-config-name,device-id,port-id,ipv4-address,ipv6-address,vlan-tag",nameProps="lan-port-config-name",searchable="lan-port-config-id",uniqueProps="lan-port-config-id",container="lan-port-configs",namespace="network",requiredProps="lan-port-config-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="lan-port-config-id" type="xs:string">
+        <xs:element name="lan-port-config-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this lan-port-config by id")</annox:annotate>
@@ -8912,11 +8912,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a network-resource",indexedProps="network-id,provider-id,client-id,te-topo-id",nameProps="network-id",searchable="network-id",uniqueProps="network-id",container="network-resources",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a network-resource",indexedProps="network-id,provider-id,client-id,te-topo-id",nameProps="network-id",searchable="network-id",uniqueProps="network-id",container="network-resources",namespace="network",requiredProps="network-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="network-id" type="xs:string">
+        <xs:element name="network-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this network-resource by id")</annox:annotate>
@@ -8978,11 +8978,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a site-resource",indexedProps="site-resource-id,site-resource-name,type,role,generated-site-id,operational-status",nameProps="site-resource-name",searchable="site-resource-id",uniqueProps="site-resource-id",container="site-resources",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a site-resource",indexedProps="site-resource-id,site-resource-name,type,role,generated-site-id,operational-status",nameProps="site-resource-name",searchable="site-resource-id",uniqueProps="site-resource-id",container="site-resources",namespace="network",requiredProps="site-resource-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="site-resource-id" type="xs:string">
+        <xs:element name="site-resource-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this site-resource by id")</annox:annotate>
@@ -9086,11 +9086,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an sdwan-vpn",indexedProps="sdwan-vpn-id,sdwan-vpn-name,vxlan-id,topology,operational-status",nameProps="sdwan-vpn-name",searchable="sdwan-vpn-id",uniqueProps="sdwan-vpn-id",container="sdwan-vpns",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an sdwan-vpn",indexedProps="sdwan-vpn-id,sdwan-vpn-name,vxlan-id,topology,operational-status",nameProps="sdwan-vpn-name",searchable="sdwan-vpn-id",uniqueProps="sdwan-vpn-id",container="sdwan-vpns",namespace="network",requiredProps="sdwan-vpn-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="sdwan-vpn-id" type="xs:string">
+        <xs:element name="sdwan-vpn-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this sdwan-vpn by id")</annox:annotate>
@@ -9194,11 +9194,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a device",indexedProps="device-id,device-name,esn,vendor,class,type,version,system-ip,system-ipv4,system-ipv6,operational-status",nameProps="device-name",searchable="device-id",uniqueProps="device-id",container="devices",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a device",indexedProps="device-id,device-name,esn,vendor,class,type,version,system-ip,system-ipv4,system-ipv6,operational-status",nameProps="device-name",searchable="device-id",uniqueProps="device-id",container="devices",namespace="network",requiredProps="device-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="device-id" type="xs:string">
+        <xs:element name="device-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this device by id")</annox:annotate>
@@ -9337,11 +9337,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a wan-port-config",indexedProps="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",nameProps="wan-port-config-name",searchable="wan-port-config-id",uniqueProps="wan-port-config-id",container="wan-port-configs",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a wan-port-config",indexedProps="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",nameProps="wan-port-config-name",searchable="wan-port-config-id",uniqueProps="wan-port-config-id",container="wan-port-configs",namespace="network",requiredProps="wan-port-config-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="wan-port-config-id" type="xs:string">
+        <xs:element name="wan-port-config-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this wan-port-config by id")</annox:annotate>
@@ -9529,11 +9529,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Refer to an external AAI in another ONAP.",indexedProps="aai-id",searchable="aai-id",container="ext-aai-networks",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Refer to an external AAI in another ONAP.",indexedProps="aai-id",searchable="aai-id",container="ext-aai-networks",namespace="network",requiredProps="aai-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="aai-id" type="xs:string">
+        <xs:element name="aai-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the referenced AAI.")</annox:annotate>
@@ -9683,46 +9683,46 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models",requiredProps="model-invariant-id,model-name-version-id,model-type,model-name,model-id,model-version")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string">
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-name-version-id" type="xs:string">
+        <xs:element name="model-name-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-type" type="xs:string">
+        <xs:element name="model-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-name" type="xs:string">
+        <xs:element name="model-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-id" type="xs:string">
+        <xs:element name="model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-version" type="xs:string">
+        <xs:element name="model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate>
@@ -9886,11 +9886,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true",requiredProps="vnf-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd
index 739caa2..2c0d99c 100644 (file)
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd
@@ -1,10131 +1,10131 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://org.onap.aai.inventory/v15" xmlns:tns="http://org.onap.aai.inventory/v15" xmlns:xs="http://www.w3.org/2001/XMLSchema"
-xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="2.1"
-    xmlns:annox="http://annox.dev.java.net"
-    jaxb:extensionBindingPrefixes="annox">
-
-  <xs:element name="inventory-item-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory-item">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="inventory-item-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="inventory-item-link" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:inventory-item-data" minOccurs="0" maxOccurs="5000"/>
-        <xs:element ref="tns:tagged-inventory-item-list" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tagged-inventory-item-list">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:inventory-item" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="edge-tag-query-result">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:tagged-inventory-item-list" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="start-node-filter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="include-node-filter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="include-node-type" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="secondary-filter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="filter-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="edge-tag-query-request">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="edge-tag" type="xs:string" minOccurs="0"/>
-        <xs:element name="result-detail" type="xs:string" minOccurs="0"/>
-        <xs:element name="start-node-type" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:start-node-filter" minOccurs="0" maxOccurs="5000"/>
-        <xs:element ref="tns:include-node-filter" minOccurs="0" maxOccurs="5000"/>
-        <xs:element ref="tns:secondary-filter" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="result-data">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="The URL to the specific resource")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="resource-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The specific type of node in the A&amp;AI graph")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-link" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The URL to the specific resource")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="search-results">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:result-data" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="relationship-data">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Value of the attribute.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="relationship-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate an attribute.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="relationship-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Value of the attribute.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="related-to-property">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Value part of a key/value pair")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="property-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Key part of a key/value pair")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="property-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Value part of a key/value pair")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="relationship">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="URL to the object in A&amp;AI.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="related-to" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate type of node.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="relationship-label" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The edge label for this relationship.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="related-link" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to the object in A&amp;AI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-data" minOccurs="0" maxOccurs="5000"/>
-        <xs:element ref="tns:related-to-property" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="relationship-list">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:relationship" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="oam-network">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks",uriTemplate="/oam-networks/oam-network/{network-uuid}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="network-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of the network. Unique across a cloud-region")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="cvlan-id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for VNF firewall rule so customer cannot send customer traffic over this oam network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for VNF firewall rule so customer cannot send customer traffic over this oam network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="oam-networks">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. ")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:oam-network" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="dvs-switch">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches",uriTemplate="/dvs-switches/dvs-switch/{switch-name}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="switch-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="DVS switch name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vcenter-url" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL used to reach the vcenter")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="dvs-switches">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:dvs-switch" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="availability-zone">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones",uriTemplate="/availability-zones/availability-zone/{availability-zone-name}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="availability-zone-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the availability zone.  Unique across a cloud region")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="hypervisor-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of hypervisor.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="az-and-dvs-switches">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:dvs-switches" minOccurs="0"/>
-        <xs:element ref="tns:availability-zone" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sdn-zone-response">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:oam-networks" minOccurs="0"/>
-        <xs:element ref="tns:az-and-dvs-switches" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="search">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:edge-tag-query-result" minOccurs="0"/>
-        <xs:element ref="tns:edge-tag-query-request" minOccurs="0"/>
-        <xs:element ref="tns:search-results" minOccurs="0"/>
-        <xs:element ref="tns:sdn-zone-response" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="update-node-key">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="key-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="key-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="action-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="action">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="action-type" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:action-data" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="update">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="update-node-type" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:update-node-key" minOccurs="0" maxOccurs="5000"/>
-        <xs:element name="update-node-uri" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:action" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="key-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="key-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="key-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="notify">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="event-id" type="xs:string" minOccurs="0"/>
-        <xs:element name="node-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="event-trigger" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:key-data" minOccurs="0" maxOccurs="5000"/>
-        <xs:element name="selflink" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="actions">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="APIs that are more action related than REST (e.g., notify, update).")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:update" minOccurs="0"/>
-        <xs:element ref="tns:notify" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-pool">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools",uriTemplate="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="target-pe" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="The Target provider edge router")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="availability-zone-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the availability zone")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ctag-pool-purpose" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Describes what the intended purpose of this pool is.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ctag-values" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Comma separated list of ctags")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-pools">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:ctag-pool" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="complex">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/complexes/complex/{physical-location-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="physical-location-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier for physical location, e.g., CLLI")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="data-center-code" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Data center code which can be an alternate way to identify a complex")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="complex-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Gamma complex name for LCP instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="identity-url" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL of the keystone identity service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="physical-location-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type, e.g., central office, data center.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="street1" type="xs:string" minOccurs="0"/>
-        <xs:element name="street2" type="xs:string" minOccurs="0"/>
-        <xs:element name="city" type="xs:string" minOccurs="0"/>
-        <xs:element name="state" type="xs:string" minOccurs="0"/>
-        <xs:element name="postal-code" type="xs:string" minOccurs="0"/>
-        <xs:element name="country" type="xs:string" minOccurs="0"/>
-        <xs:element name="region" type="xs:string" minOccurs="0"/>
-        <xs:element name="latitude" type="xs:string" minOccurs="0"/>
-        <xs:element name="longitude" type="xs:string" minOccurs="0"/>
-        <xs:element name="elevation" type="xs:string" minOccurs="0"/>
-        <xs:element name="lata" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:ctag-pools" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="complexes">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:complex" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volume-group">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups",uriTemplate="/volume-groups/volume-group/{volume-group-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="volume-group-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of volume-group.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="volume-group-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the volume group.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Heat stack id corresponding to this volume-group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this volume-group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-module-model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="helps relate the volume group to the vf-module whose components will require the volume group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volume-groups">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of persistent block-level storage.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:volume-group" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volume">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes",uriTemplate="/volumes/volume/{volume-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="volume-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of block storage volume relative to the vserver.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="volume-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volumes">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of ephemeral Block storage volumes.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:volume" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-interface-ipv4-address-list">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc,cp",uriTemplate="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="l3-interface-ipv4-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="l3-interface-ipv4-prefix-length" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prefix length, 32 for single address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-floating" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator of fixed or floating address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron network id of the interface that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron id of subnet that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-interface-ipv6-address-list">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc,cp",uriTemplate="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="l3-interface-ipv6-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="l3-interface-ipv6-prefix-length" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prefix length, 128 for single address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-floating" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator of fixed or floating address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron network id of the interface that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron id of subnet that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vlan">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans",uriTemplate="/vlans/vlan/{vlan-interface}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vlan-interface" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="String that identifies the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used to describe (the service associated with) the vlan")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="backdoor-connection" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Whether customer is going to use this VLAN for backdoor connection to another customer premise device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This indicates the customers VPN ID associated with this vlan")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prov Status of the VLAN configuration related to a logical interface. Valid values [PREPROV/NVTPROV/PROV].")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-ip-unnumbered" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Flag indicating the interface uses the IP Unnumbered configuration.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-private" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Private VLAN indicator.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="5000"/>
-        <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vlans">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:vlan" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sriov-vf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs",uriTemplate="/sriov-vfs/sriov-vf/{pci-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="pci-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="PCI ID used to identify the sriov-vf")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-vlan-filter" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-mac-filter" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-vlan-strip" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-vlan-anti-spoof-check" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-mac-anti-spoof-check" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-mirrors" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-broadcast-allow" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-unknown-multicast-allow" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-unknown-unicast-allow" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-insert-stag" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This option, if set to true, instructs to insert outer tag after traffic comes out of VM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-link-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron network id of the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sriov-vfs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of SR-IOV Virtual Functions.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:sriov-vf" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l-interface">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface",container="l-interfaces",uriTemplate="/l-interfaces/l-interface/{interface-name}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="interface-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name given to the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="E.g., CUSTOMER, UPLINK, etc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="v6-wan-link-ip" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ID of interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="macaddr" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="MAC address for the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Whether A&amp;AI should be managing this interface of not. Could have value like CUSTOMER")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Human friendly text regarding this interface.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-port-mirrored" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not port is a mirrored.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prov Status of the logical interface. Valid values [PREPROV/NVTPROV/PROV].")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-ip-unnumbered" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Flag indicating the interface uses the IP Unnumbered configuration.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="allowed-address-pairs" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Freeform field for storing an ip address, list of ip addresses or a subnet block.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="priority" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Priority used for fail-over. Valid values 1-1024, with 1 being the highest priority.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:vlans" minOccurs="0"/>
-        <xs:element ref="tns:sriov-vfs" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="5000"/>
-        <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="5000"/>
-        <xs:element name="admin-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Administrative status of the interface. Valid values are 'up', 'down', or 'testing'.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l-interfaces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of logical interfaces.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:l-interface" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vserver">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers",uriTemplate="/vservers/vserver/{vserver-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vserver-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier for this vserver relative to its tenant")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vserver-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of vserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vserver-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Alternative name of vserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vserver-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether closed loop function is enabled on this node")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:volumes" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vservers">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of virtual Servers, aka virtual machines or VMs.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vserver" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="nos-server">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="nos-server is the execution environment that will have images, certain versions of VNOS, running on it.",indexedProps="nos-server-id",dependentOn="tenant",nameProps="nos-server-name",container="nos-servers",uriTemplate="/nos-servers/nos-server/{nos-server-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="nos-server-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier for this nos relative to its tenant")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nos-server-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of nos")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="uCPE vendor")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nos-server-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="nos-servers">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="nos-server is the execution environment that will have images, certain versions of VNOS, running on it.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:nos-server" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tenant">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id,tenant-context",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants",uriTemplate="/tenants/tenant/{tenant-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="tenant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id relative to the cloud-region.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="tenant-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Readable name of tenant")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="tenant-context" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This field will store the tenant context.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:vservers" minOccurs="0"/>
-        <xs:element ref="tns:nos-servers" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tenants">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:tenant" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="hpa-feature-attributes">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="HPA Capability Feature attributes",indexedProps="hpa-attribute-key",dependentOn="hpa-capability")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="hpa-attribute-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="name of the specific HPA attribute")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="hpa-attribute-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="JSON string specifying the value, unit and type of the specific HPA attribute")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="hpa-capability">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a HPA capability",indexedProps="hpa-feature,architecture,hpa-capability-id",dependentOn="flavor,cloud-region",container="hpa-capabilities")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="hpa-capability-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID to uniquely identify a HPA capability")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="hpa-feature" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the HPACapability")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="hpa-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="HPA schema version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="architecture" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Hardware architecture")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:hpa-feature-attributes" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="hpa-capabilities">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of HPA Capabilities")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:hpa-capability" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="flavor">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors",uriTemplate="/flavors/flavor/{flavor-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="flavor-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Flavor id, expected to be unique across cloud-region.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Cloud Region Flavor name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-vcpus" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Number of CPUs")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-ram" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Amount of memory")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-disk" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Disk space")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-ephemeral" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Amount of ephemeral disk space")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-swap" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="amount of swap space allocation")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-is-public" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="whether flavor is available to all users or private to the tenant it was created in.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-disabled" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Boolean as to whether this flavor is no longer enabled")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:hpa-capabilities" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="List of flavor specific HPA Capabilities")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="flavors">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack flavors.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:flavor" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="group-assignment">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments",uriTemplate="/group-assignments/group-assignment/{group-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="group-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Group id, expected to be unique across cloud-region.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="group-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group type - the type of group this instance refers to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="group-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group name - name assigned to the group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="group-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group description - description of the group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="group-assignments">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack group assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:group-assignment" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="snapshot">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots",uriTemplate="/snapshots/snapshot/{snapshot-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="snapshot-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Snapshot id, this is the key UUID assoc associated in glance with the snapshots.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Snapshot name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-architecture" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operating system architecture")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-os-distro" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-os-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The operating system version as specified by the distributor.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prev-snapshot-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This field contains the UUID of the previous snapshot (if any).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="snapshots">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack snapshots")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:snapshot" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="metadatum">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata",uriTemplate="/metadata/metadatum/{metaname}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="metaname" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="metaval" type="xs:string" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="metadata">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of metadatum (key/value pairs)")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:metadatum" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="image">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images",uriTemplate="/images/image/{image-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="image-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Image id, expected to be unique across cloud region")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Image name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-architecture" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operating system architecture.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-os-distro" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-os-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The operating system version as specified by the distributor.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="images">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collectio of Openstack images.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:image" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="availability-zones">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of availability zones")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:availability-zone" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vip-ipv4-address-list">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv4-address-list/{vip-ipv4-address}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vip-ipv4-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vip-ipv4-prefix-length" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prefix length, 32 for single address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-floating" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator of fixed or floating address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron network id of the interface that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron id of subnet that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vip-ipv6-address-list">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv6-address-list/{vip-ipv6-address}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vip-ipv6-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vip-ipv6-prefix-length" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prefix length, 128 for single address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-floating" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator of fixed or floating address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron network id of the interface that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron id of subnet that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="esr-system-info">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist common address information of external systems.",indexedProps="esr-system-info-id,system-name,system-type",searchable="esr-system-info-id,system-name,system-type",container="esr-system-info-list",dependentOn="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc,ext-aai-network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="esr-system-info-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of esr system info.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="system-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="name of external system.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="type of external systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="vendor of external systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="version of external systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-url" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="url used to access external systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="user-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="username used to access external systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="password" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="password used to access external systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="system-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="it could be vim/vnfm/thirdparty-sdnc/ems-resource/ems-performance/ems-alarm.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="protocol" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="protocol of third party SDNC, for example netconf/snmp.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ssl-cacert" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ca file content if enabled ssl on auth-url.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ssl-insecure" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Whether to verify VIM's certificate.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ip-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="service IP of ftp server.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="port" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="service port of ftp server.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-domain" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="domain info for authentication.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="default-tenant" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="default tenant of VIM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="passive" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ftp passive mode or not.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="remote-path" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="resource or performance data file path.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="system-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the status of external system.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="openstack-region-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="OpenStack region ID used by MultiCloud plugin to interact with an OpenStack instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="esr-system-info-list">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of persistent block-level external system auth info.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:esr-system-info" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cloud-region">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&amp;T's AIC.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="cloud-owner" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-region-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifier used by the vendor for the region. Second part of composite key")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the cloud (e.g., openstack)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="owner-defined-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Cloud-owner defined type indicator (e.g., dcp, lcp)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-region-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="identity-url" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL of the keystone identity service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="complex-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="sriov-automation" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Whether the cloud region supports (true) or does not support (false) SR-IOV automation.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-extra-info" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ESR inputs extra information about the VIM or Cloud which will be decoded by MultiVIM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:volume-groups" minOccurs="0"/>
-        <xs:element ref="tns:tenants" minOccurs="0"/>
-        <xs:element ref="tns:flavors" minOccurs="0"/>
-        <xs:element ref="tns:group-assignments" minOccurs="0"/>
-        <xs:element ref="tns:snapshots" minOccurs="0"/>
-        <xs:element ref="tns:images" minOccurs="0"/>
-        <xs:element ref="tns:dvs-switches" minOccurs="0"/>
-        <xs:element ref="tns:oam-networks" minOccurs="0"/>
-        <xs:element ref="tns:availability-zones" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:vip-ipv4-address-list" minOccurs="0" maxOccurs="5000"/>
-        <xs:element ref="tns:vip-ipv6-address-list" minOccurs="0" maxOccurs="5000"/>
-        <xs:element ref="tns:hpa-capabilities" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="List of cloud-region specific HPA Capabilities")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:esr-system-info-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cloud-regions">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:cloud-region" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-profile">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="nm-profile-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique name of network profile.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="community-string" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Encrypted SNMP community string")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-profiles">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of network profiles")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:network-profile" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sriov-pf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Physical Function",indexedProps="pf-pci-id",dependentOn="p-interface",container="sriov-pfs",uriTemplate="/sriov-pfs/sriov-pf/{pf-pci-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="pf-pci-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifier for the sriov-pf")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sriov-pfs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of SR-IOV Physical Functions.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:sriov-pf" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="p-interface">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,networkRef,operational-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="interface-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name that identifies the physical interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="port-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Nature of the services and connectivity on this port.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-identifier" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="CLEI or other specification for p-interface hardware.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Role specification for p-interface hardware.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates the physical properties of the interface.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mac-addresss" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="MAC Address of the p-interface.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="inv-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="inventory status")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-ref" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the network-ref of this p-interface. Derived from ietf-restconf-notification that identifies a termination-point.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="transparent" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the transparent value of this p-interface.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="oper Status of this p-interface.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:sriov-pfs" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="p-interfaces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical interfaces.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:p-interface" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-interface">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces",uriTemplate="/lag-interfaces/lag-interface/{interface-name}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="interface-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name that identifies the link aggregate interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Human friendly text regarding this interface.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ID of interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Role assigned to this Interface, should use values as defined in ECOMP Yang models.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-interfaces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of link aggregate interfaces.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:lag-interface" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="hpa-capacity">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="HPA Capacity information for compute node",indexedProps="hpa-capacity-key",dependentOn="hpa-capacity")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="hpa-capacity-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Composite key formed with hpaFeature and append list of hpaFeatureAttributes needed for capacity check")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="hpa-capacity-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="JSON string specifying the capacity (total,free), unit and metadata of the specific HPA attribute")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pserver">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",uniqueProps="hostname",container="pservers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/pservers/pserver/{hostname}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="hostname" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Value from executing hostname on the compute node.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ptnii-equip-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="PTNII name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="number-of-cpus" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Number of cpus")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="disk-in-gigabytes" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Disk size, in GBs")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ram-in-megabytes" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="RAM size, in MBs")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Equipment type.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Equipment vendor.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-model" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Equipment model.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Fully-qualified domain name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pserver-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used to configure device, also used for troubleshooting and is IP used for traps generated by device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="serial-number" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Serial number, may be queried")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IPV4 Loopback 0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IPV6 Loopback 0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IPV4 AIM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IPV6 AIM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-oam" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IPV6 OAM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="inv-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pserver-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ID of Pserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="internet-topology" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="internet topology of Pserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pserver-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="alternative pserver name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="purpose" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="purpose of pserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates who owns and or manages the device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="host-profile" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The host profile that defines the configuration of the pserver.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:p-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:hpa-capacity" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pservers">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of compute hosts.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:pserver" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="virtual-data-center">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vdc-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vdc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vdc-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the virtual data center")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="virtual-data-centers">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:virtual-data-center" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="operational-environment">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="It is a logical partition of the cloud which allows to have multiple environments in the production AIC.",indexedProps="operational-environment-id",nameProps="operational-environment-name",uniqueProps="operational-environment-id",container="operational-environments",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/operational-environments/operational-environment/{operational-environment-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="operational-environment-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of an operational environment")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-environment-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operational Environment name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-environment-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operational Environment Type.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-environment-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Status")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="tenant-context" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Tenant Context.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="workload-context" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Workload Context.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="operational-environments">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:operational-environment" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-technology">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="The network-technology object is used to capture the supported network technologies of a cloud-region.",nameProps="network-technology-id,network-technology-name",uniqueProps="network-technology-id",container="network-technologies",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-technologies/network-technology/{network-technology-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="network-technology-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier of the network-technology object (UUID)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-technology-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The network-technology  that a cloud-region can support. Current valid values- CONTRAIL AIC_SR_IOV OVS STANDARD-SR-IOV")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-technologies">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description=" The network-technology object is used to capture the supported network technologies of a cloud-region.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:network-technology" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cloud-infrastructure">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for cloud infrastructure.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:complexes" minOccurs="0"/>
-        <xs:element ref="tns:cloud-regions" minOccurs="0"/>
-        <xs:element ref="tns:network-profiles" minOccurs="0"/>
-        <xs:element ref="tns:pservers" minOccurs="0"/>
-        <xs:element ref="tns:virtual-data-centers" minOccurs="0"/>
-        <xs:element ref="tns:operational-environments" minOccurs="0"/>
-        <xs:element ref="tns:network-technologies" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="esr-ems">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist EMS address information used by EMS driver.",indexedProps="ems-id",searchable="ems-id",container="esr-ems-list",namespace="external-system")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="ems-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of EMS.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:esr-system-info-list" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="esr-ems-list">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:esr-ems" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="esr-vnfm">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist VNFM address information used by VF-C.",indexedProps="vnfm-id",searchable="vnfm-id",container="esr-vnfm-list",namespace="external-system")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnfm-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of VNFM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vim-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="indecate the VIM to deploy VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="certificate-url" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="certificate url of VNFM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:esr-system-info-list" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="esr-vnfm-list">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:esr-vnfm" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="esr-thirdparty-sdnc">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="thirdparty-sdnc-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of SDNC.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="location" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="used for DC type to indicate the location of SDNC, such as Core or Edge.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="product-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="password used to access SDNC server.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:esr-system-info-list" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="esr-thirdparty-sdnc-list">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:esr-thirdparty-sdnc" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="external-system">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for external system.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:esr-ems-list" minOccurs="0"/>
-        <xs:element ref="tns:esr-vnfm-list" minOccurs="0"/>
-        <xs:element ref="tns:esr-thirdparty-sdnc-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="connector">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business",uriTemplate="/business/connectors/connector/{resource-instance-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="resource-instance-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of resource instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="connectors">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:connector" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tunnel-xconnect">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects",uriTemplate="/tunnel-xconnects/tunnel-xconnect/{id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tunnel-xconnects">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object is used to store the specific tunnel cross connect aspects of an allotted resource")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:tunnel-xconnect" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="allotted-resource">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description,allotted-resource-name",uniqueProps="id",indexedProps="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",dependentOn="service-instance",container="allotted-resources",uriTemplate="/allotted-resources/allotted-resource/{id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The descriptive information assigned to this allotted resource instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Link back to more information in the controller")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Generic description of the type of allotted resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="role in the network that this resource will be providing.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="allotted-resource-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the name of this allotted-resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="access-provider-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access provider of this allotted-resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="access-client-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access client of this allotted-resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="access-topology-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access topology of this allotted-resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="access-node-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access node of this allotted-resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="access-ltp-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access ltp of this allotted-resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cvlan" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the cvlan of this allotted-resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the vpn-name of this allotted-resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:tunnel-xconnects" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="allotted-resources">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object is used to store slices of services being offered")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:allotted-resource" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-instance">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="service-instance-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this instance of a service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-instance-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This field will store a name assigned to the service-instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing the service role.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="environment-context" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This field will store the environment context assigned to the service-instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="workload-context" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This field will store the workload context assigned to the service-instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="created-at" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="create time of Network Service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="updated-at" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="last update of Network Service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="short description for service-instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-total" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates the total bandwidth to be used for this service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vhn-portal-url" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL customers will use to access the vHN Portal.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-instance-location-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="An identifier that customers assign to the location where this service is being used.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="input-parameters" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing request parameters from SO to pass to Closed Loop.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-        <xs:element ref="tns:allotted-resources" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-instances">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of service instances")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:service-instance" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-subscription">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type",uriTemplate="/service-subscriptions/service-subscription/{service-type}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="service-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Value defined by orchestration to identify this service across ECOMP.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="temp-ub-sub-account-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This property will be deleted from A&amp;AI in the near future. Only stop gap solution.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:service-instances" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-subscriptions">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of objects that group service instances.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:service-subscription" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="customer">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business",uriTemplate="/business/customers/customer/{global-customer-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="global-customer-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Global customer id used across ECOMP to uniquely identify customer.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="subscriber-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Subscriber name, an alternate way to retrieve a customer.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="subscriber-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Subscriber type, a way to provide VID with only the INFRA customers.",defaultValue="CUST")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:service-subscriptions" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="customers">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:customer" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="line-of-business">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a line-of-business",indexedProps="line-of-business-name",uniqueProps="line-of-business-name",container="lines-of-business",namespace="business",uriTemplate="/business/lines-of-business/line-of-business/{line-of-business-name}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="line-of-business-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the line-of-business (product)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lines-of-business">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of lines-of-business")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:line-of-business" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="owning-entity">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes an owning-entity",indexedProps="owning-entity-id,owning-entity-name",searchable="owning-entity-id",uniqueProps="owning-entity-id,owning-entity-name",container="owning-entities",namespace="business",uriTemplate="/business/owning-entities/owning-entity/{owning-entity-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="owning-entity-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of an owning entity")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="owning-entity-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Owning entity name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="owning-entities">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of owning-entities")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:owning-entity" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="platform">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a platform",indexedProps="platform-name",uniqueProps="platform-name",container="platforms",namespace="business",uriTemplate="/business/platforms/platform/{platform-name}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="platform-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the platform")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="platforms">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of platforms")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:platform" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="project">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes the project",indexedProps="project-name",uniqueProps="project-name",container="projects",namespace="business",uriTemplate="/business/projects/project/{project-name}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="project-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the project deploying a service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="projects">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of projects")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:project" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sp-partner">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an sp-partner",indexedProps="sp-partner-id,url,callsource",nameProps="sp-partner-id",searchable="sp-partner-id",uniqueProps="sp-partner-id",container="sp-partners",namespace="business",uriTemplate="/business/sp-partners/sp-partner/{sp-partner-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="sp-partner-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this sp-partner by id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="url" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the URL of this sp-partner.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="callsource" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the callsource of this sp-partner.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this sp-partner.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this sp-partner.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this sp-partner model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this sp-partner model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sp-partners">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of sp-partners")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:sp-partner" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="business">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for business related constructs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:connectors" minOccurs="0"/>
-        <xs:element ref="tns:customers" minOccurs="0"/>
-        <xs:element ref="tns:lines-of-business" minOccurs="0"/>
-        <xs:element ref="tns:owning-entities" minOccurs="0"/>
-        <xs:element ref="tns:platforms" minOccurs="0"/>
-        <xs:element ref="tns:projects" minOccurs="0"/>
-        <xs:element ref="tns:sp-partners" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnf-image">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-image-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of this asset")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnf-images">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vnf-image" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/services/service/{service-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Description of the service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="service version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="services">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:service" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-capability">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="service-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-capabilities">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of service capabilities.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:service-capability" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="element-choice-set">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets",uriTemplate="/element-choice-sets/element-choice-set/{element-choice-set-uuid}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="element-choice-set-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="element-choice-set-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="cardinality" type="xs:string" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:model-elements" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="element-choice-sets">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:element-choice-set" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="constrained-element-set">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets",uriTemplate="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="constrained-element-set-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="constraint-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="check-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:element-choice-sets" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="constrained-element-sets">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:constrained-element-set" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-constraint">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints",uriTemplate="/model-constraints/model-constraint/{model-constraint-uuid}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-constraint-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:constrained-element-sets" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-constraints">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:model-constraint" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-element">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements",uriTemplate="/model-elements/model-element/{model-element-uuid}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-element-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="new-data-del-flag" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates whether this element was created as part of instantiation from this model")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cardinality" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="How many of this type of element are required/allowed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="linkage-points" type="xs:string" minOccurs="0" maxOccurs="5000"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-elements" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-constraints" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Describes new constraints on this model element that are not part of that model's definition")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-elements">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:model-element" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-ver">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version,distribution-status",uniqueProps="model-version-id",container="model-vers",uriTemplate="/model-vers/model-ver/{model-version-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="distribution-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Distribution Status")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Description")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-elements" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-vers">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:model-ver" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/models/model/{model-invariant-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-vers" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="models">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:model" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="related-lookup">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="related-lookup-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="source-node-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="source-node-property" type="xs:string" minOccurs="0"/>
-        <xs:element name="target-node-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="target-node-property" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="5000"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="related-lookups">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:related-lookup" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="property-constraint">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="property-constraint-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="constraint-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="property-constraints">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:property-constraint" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-query-element">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="named-query-element-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="5000"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-limit-desc" type="xs:string" minOccurs="0"/>
-        <xs:element name="do-not-output" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:named-query-elements" minOccurs="0"/>
-        <xs:element ref="tns:related-lookups" minOccurs="0"/>
-        <xs:element ref="tns:property-constraints" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-query-elements">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:named-query-element" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-query">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="named-query-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="named-query-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="named-query-version" type="xs:string" minOccurs="0"/>
-        <xs:element name="required-input-params" minOccurs="0">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="required-input-param" type="xs:string" minOccurs="0" maxOccurs="5000"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="description" type="xs:string" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:named-query-elements" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-queries">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:named-query" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-design-and-creation">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for objects managed by ASDC")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vnf-images" minOccurs="0"/>
-        <xs:element ref="tns:services" minOccurs="0"/>
-        <xs:element ref="tns:service-capabilities" minOccurs="0"/>
-        <xs:element ref="tns:models" minOccurs="0"/>
-        <xs:element ref="tns:named-queries" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="logical-link">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose,operational-status",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",uriTemplate="/network/logical-links/logical-link/{link-name}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="link-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="link-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of logical link, e.g., evc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="v4, v6, or ds for dual stack")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="routing-protocol" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="For example, static or BGP")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indication of operational status of the logical link.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="link-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indication of the network use of the logical link.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="link-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Alias or alternate name (CLCI or D1 name).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="link-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="UUID of the logical-link, SDNC generates this.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="circuit-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Circuit id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="purpose" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Reason for this entity, role it is playing")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="logical-links">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of logical connections")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:logical-link" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="class-of-service">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service",uriTemplate="/classes-of-service/class-of-service/{cos}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="cos" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="probe-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="identifier of probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="probe-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="type of probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="classes-of-service">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="class-of-service of probe")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:class-of-service" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pair">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs",uriTemplate="/site-pairs/site-pair/{site-pair-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="site-pair-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="source-ip" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prefix address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="destination-ip" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prefix address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ip version, v4, v6")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="destination-hostname" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Hostname of the destination equipment to which SLAs are measured against.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="destination-equip-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The type of destinatination equipment. Could be Router, UCPE, etc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:classes-of-service" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pairs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="probe within a set")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:site-pair" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="routing-instance">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances",uriTemplate="/routing-instances/routing-instance/{routing-instance-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="routing-instance-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of routing instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="rpm-owner" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="rpm owner")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:site-pairs" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="routing-instances">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="set of probes related to generic-vnf routing instance")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:routing-instance" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pair-set">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network",uriTemplate="/network/site-pair-sets/site-pair-set/{site-pair-set-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="site-pair-set-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of site pair set.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:routing-instances" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pair-sets">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of sets of instances for probes related to generic-vnf")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:site-pair-set" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-target">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true",uriTemplate="/route-targets/route-target/{global-route-target}/{route-target-role}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="global-route-target" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Number used to identify an RT, globally unique in the network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="route-target-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Role assigned to this route target")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-targets">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of route target information")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:route-target" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpn-binding">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="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",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vpn-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="VPN ID, globally unique within A&amp;AI")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VPN Name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-platform" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the platform associated with the VPN example AVPN, Mobility")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the vpn, should be taken from enumerated/valid values")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-region" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="region of customer vpn")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="customer-vpn-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="id for this customer vpn")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="route-distinguisher" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="access-provider-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access provider of this vpn.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="access-client-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access client of this vpn.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="access-topology-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access topology of this vpn.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="src-access-node-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the src-access-node of this vpn.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="src-access-ltp-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the src-access-ltp of this vpn.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dst-access-node-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the dst-access-node of this vpn.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dst-access-ltp-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the dst-access-ltp of this vpn.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:route-targets" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="l3-networks relate to vpn-bindings")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpn-bindings">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:vpn-binding" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpls-pe">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network",uriTemplate="/network/vpls-pes/vpls-pe/{equipment-name}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="equipment-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Client should send valid enumerated value, e.g., VPLS-PE.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Temporary location for stag to get to VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:p-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpls-pes">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of VPLS Provider Edge routers")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vpls-pe" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="multicast-configuration">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network",uriTemplate="/network/multicast-configurations/multicast-configuration/{multicast-configuration-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="multicast-configuration-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of multicast configuration.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="multicast-protocol" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="protocol of multicast configuration")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="rp-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="rp type of multicast configuration")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="multicast-configurations">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="multicast configuration of generic-vnf ip-address")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:multicast-configuration" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cvlan-tag-entry">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="See mis-na-virtualization-platform.yang")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cvlan-tags">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:cvlan-tag-entry" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="port-group">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="interface-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron network id of this Interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron network name of this Interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Role assigned to this Interface, should use values as defined in ECOMP Yang models.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="port-group-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Unique ID for port group in vmware")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="port-group-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Likely to duplicate value of neutron network name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="switch-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="DVS or standard switch name (should be non-null for port groups associated with DVS)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:cvlan-tags" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="port-groups">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:port-group" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="license">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the license group the resource belongs to, should be uuid.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of a license resource. ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="licenses">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:license" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="entitlement">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements",uriTemplate="/entitlements/entitlement/{group-uuid}/{resource-uuid}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the entitlement group the resource comes from, should be uuid.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of an entitlement resource. ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="entitlements">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Entitlements, keyed by group-uuid and resource-uuid, related to license management")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:entitlement" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vce">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="OBSOLETE -  do not use")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Network role being played by this VNF")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpe-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Unique ID of VPE connected to this VCE.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="v6-vce-wan-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Valid v6 IP address for the WAN Link on this router.  Implied length of /64.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Loopback0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="entitlement-resource-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="OBSOLETE -  see child relationships")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:port-groups" minOccurs="0"/>
-        <xs:element ref="tns:licenses" minOccurs="0"/>
-        <xs:element ref="tns:entitlements" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vce" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cp">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="point of attachment from services or resources to a virtual link or network.",uniqueProps="cp-instance-id",dependentOn="vnfc",container="cps",uriTemplate="/cps/cp/{cp-instance-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="cp-instance-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the connection point.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="port-id" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="port index to represent multiple CPs on VNFC connected to same network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="5000"/>
-        <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cps">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of connection points.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:cp" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnfc">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id",searchable="vnfc-name",container="vnfcs",namespace="network",uriTemplate="/network/vnfcs/vnfc/{vnfc-name}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnfc-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of vnfc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nfc-naming-code" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Short code that is used in naming instances of the item being modeled")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nfc-function" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="prov status of this vnfc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by APP-C")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-oam-vip" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Oam V4 vip address of this vnfc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="group-notation" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group notation of VNFC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:cps" minOccurs="0"/>
-        <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="5000"/>
-        <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnfcs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="virtual network components associated with a vserver from application controller.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vnfc" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="host-route">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="host-route-id",dependentOn="subnet",container="host-routes",uriTemplate="/host-routes/host-route/{host-route-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="host-route-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="host-route id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="route-prefix" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="subnet prefix")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="next-hop" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Could be ip-address, hostname, or service-instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="next-hop-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Should be ip-address, hostname, or service-instance to match next-hop")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="host-routes">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:host-route" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="subnet">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="subnet-id,subnet-name",nameProps="subnet-name",uniqueProps="subnet-id",dependentOn="l3-network",container="subnets",uriTemplate="/subnets/subnet/{subnet-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="subnet-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Subnet ID, should be UUID.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="subnet-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name associated with the subnet.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron id of this subnet")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="gateway-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="gateway ip address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-start-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="network start address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cidr-mask" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="cidr mask")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ip version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dhcp-enabled" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="dhcp enabled")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dhcp-start" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the start address reserved for use by dhcp")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dhcp-end" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the last address reserved for use by dhcp")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="subnet-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="role of the subnet, referenced when assigning IPs")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ip-assignment-direction" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ip address assignment direction of the subnet")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="subnet-sequence" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="sequence of the subnet")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:host-routes" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="subnets">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:subnet" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-assignment">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vlan-id-inner",dependentOn="l3-network",container="ctag-assignments",uriTemplate="/ctag-assignments/ctag-assignment/{vlan-id-inner}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="id.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-assignments">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:ctag-assignment" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="segmentation-assignment">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments",uriTemplate="/segmentation-assignments/segmentation-assignment/{segmentation-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="segmentation-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="segmentation-assignments">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack segmentation assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:segmentation-assignment" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="aggregate-route">
-    <xs:complexType>
-      <xs:annotation>\r
-        <xs:appinfo>\r
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="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. ",uniqueProps="route-id",container="aggregate-routes",dependentOn="l3-network",uriTemplate="/aggregate-routes/aggregate-route/{route-id}")</annox:annotate>\r
-        </xs:appinfo>\r
-      </xs:annotation>\r
-      <xs:sequence>
-        <xs:element name="route-id" type="xs:string" minOccurs="0">
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
+<xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://org.onap.aai.inventory/v15" xmlns:tns="http://org.onap.aai.inventory/v15" xmlns:xs="http://www.w3.org/2001/XMLSchema"\r
+xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"\r
+    jaxb:version="2.1"\r
+    xmlns:annox="http://annox.dev.java.net"\r
+    jaxb:extensionBindingPrefixes="annox">\r
+\r
+  <xs:element name="inventory-item-data">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element name="property-name" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="property-value" type="xs:string" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="inventory-item">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element name="inventory-item-type" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="inventory-item-link" type="xs:string" minOccurs="0"/>\r
+        <xs:element ref="tns:inventory-item-data" minOccurs="0" maxOccurs="5000"/>\r
+        <xs:element ref="tns:tagged-inventory-item-list" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="tagged-inventory-item-list">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:inventory-item" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="edge-tag-query-result">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:tagged-inventory-item-list" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="start-node-filter">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element name="property-name" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="property-value" type="xs:string" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="include-node-filter">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element name="include-node-type" type="xs:string" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="secondary-filter">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element name="property-name" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="filter-type" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="property-value" type="xs:string" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="edge-tag-query-request">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element name="edge-tag" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="result-detail" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="start-node-type" type="xs:string" minOccurs="0"/>\r
+        <xs:element ref="tns:start-node-filter" minOccurs="0" maxOccurs="5000"/>\r
+        <xs:element ref="tns:include-node-filter" minOccurs="0" maxOccurs="5000"/>\r
+        <xs:element ref="tns:secondary-filter" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="result-data">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="The URL to the specific resource")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="resource-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The specific type of node in the A&amp;AI graph")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-link" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The URL to the specific resource")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="search-results">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:result-data" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="relationship-data">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Value of the attribute.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="relationship-key" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate an attribute.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="relationship-value" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Value of the attribute.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="related-to-property">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Value part of a key/value pair")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="property-key" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Key part of a key/value pair")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="property-value" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Value part of a key/value pair")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="relationship">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="URL to the object in A&amp;AI.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="related-to" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate type of node.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="relationship-label" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The edge label for this relationship.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="related-link" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to the object in A&amp;AI.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-data" minOccurs="0" maxOccurs="5000"/>\r
+        <xs:element ref="tns:related-to-property" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="relationship-list">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:relationship" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="oam-network">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks",uriTemplate="/oam-networks/oam-network/{network-uuid}",requiredProps="network-uuid,network-name,cvlan-tag")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="network-uuid" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of the network. Unique across a cloud-region")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="network-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the network.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="cvlan-tag" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="cvlan-id")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for VNF firewall rule so customer cannot send customer traffic over this oam network")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for VNF firewall rule so customer cannot send customer traffic over this oam network")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="oam-networks">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. ")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:oam-network" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="dvs-switch">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches",uriTemplate="/dvs-switches/dvs-switch/{switch-name}",requiredProps="switch-name,vcenter-url")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="switch-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="DVS switch name")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vcenter-url" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL used to reach the vcenter")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="dvs-switches">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:dvs-switch" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="availability-zone">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones",uriTemplate="/availability-zones/availability-zone/{availability-zone-name}",requiredProps="availability-zone-name,hypervisor-type")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="availability-zone-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the availability zone.  Unique across a cloud region")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="hypervisor-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of hypervisor.  Source of truth should define valid values.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="az-and-dvs-switches">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:dvs-switches" minOccurs="0"/>\r
+        <xs:element ref="tns:availability-zone" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="sdn-zone-response">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:oam-networks" minOccurs="0"/>\r
+        <xs:element ref="tns:az-and-dvs-switches" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="search">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:edge-tag-query-result" minOccurs="0"/>\r
+        <xs:element ref="tns:edge-tag-query-request" minOccurs="0"/>\r
+        <xs:element ref="tns:search-results" minOccurs="0"/>\r
+        <xs:element ref="tns:sdn-zone-response" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="update-node-key">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element name="key-name" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="key-value" type="xs:string" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="action-data">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element name="property-name" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="property-value" type="xs:string" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="action">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element name="action-type" type="xs:string" minOccurs="0"/>\r
+        <xs:element ref="tns:action-data" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="update">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team.",requiredProps="update-node-type")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="update-node-type" type="xs:string" minOccurs="0"/>\r
+        <xs:element ref="tns:update-node-key" minOccurs="0" maxOccurs="5000"/>\r
+        <xs:element name="update-node-uri" type="xs:string" minOccurs="0"/>\r
+        <xs:element ref="tns:action" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="key-data">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element name="key-name" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="key-value" type="xs:string" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="notify">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element name="event-id" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="node-type" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="event-trigger" type="xs:string" minOccurs="0"/>\r
+        <xs:element ref="tns:key-data" minOccurs="0" maxOccurs="5000"/>\r
+        <xs:element name="selflink" type="xs:string" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="actions">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="APIs that are more action related than REST (e.g., notify, update).")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:update" minOccurs="0"/>\r
+        <xs:element ref="tns:notify" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="ctag-pool">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools",uriTemplate="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}",requiredProps="target-pe,availability-zone-name,ctag-pool-purpose")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="target-pe" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="The Target provider edge router")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="availability-zone-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the availability zone")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ctag-pool-purpose" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Describes what the intended purpose of this pool is.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ctag-values" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Comma separated list of ctags")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="ctag-pools">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:ctag-pool" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="complex">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/complexes/complex/{physical-location-id}",requiredProps="physical-location-id,physical-location-type,street1,city,postal-code,country,region")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="physical-location-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier for physical location, e.g., CLLI")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="data-center-code" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Data center code which can be an alternate way to identify a complex")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="complex-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Gamma complex name for LCP instance.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="identity-url" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL of the keystone identity service")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="physical-location-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type, e.g., central office, data center.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="street1" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="street2" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="city" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="state" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="postal-code" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="country" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="region" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="latitude" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="longitude" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="elevation" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="lata" type="xs:string" minOccurs="0"/>\r
+        <xs:element ref="tns:ctag-pools" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="complexes">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:complex" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="volume-group">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups",uriTemplate="/volume-groups/volume-group/{volume-group-id}",requiredProps="volume-group-id,vnf-type")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="volume-group-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of volume-group.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="volume-group-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the volume group.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Heat stack id corresponding to this volume-group")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this volume-group")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vf-module-model-customization-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="helps relate the volume group to the vf-module whose components will require the volume group")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="volume-groups">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of persistent block-level storage.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:volume-group" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="volume">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes",uriTemplate="/volumes/volume/{volume-id}",requiredProps="volume-id,volume-selflink")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="volume-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of block storage volume relative to the vserver.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="volume-selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="volumes">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of ephemeral Block storage volumes.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:volume" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="l3-interface-ipv4-address-list">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc,cp",uriTemplate="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}",requiredProps="l3-interface-ipv4-address")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="l3-interface-ipv4-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="l3-interface-ipv4-prefix-length" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prefix length, 32 for single address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="is-floating" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator of fixed or floating address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron network id of the interface that address belongs to")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron id of subnet that address belongs to")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="l3-interface-ipv6-address-list">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc,cp",uriTemplate="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}",requiredProps="l3-interface-ipv6-address")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="l3-interface-ipv6-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="l3-interface-ipv6-prefix-length" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prefix length, 128 for single address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="is-floating" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator of fixed or floating address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron network id of the interface that address belongs to")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron id of subnet that address belongs to")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vlan">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans",uriTemplate="/vlans/vlan/{vlan-interface}",requiredProps="vlan-interface,in-maint,is-ip-unnumbered")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="vlan-interface" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="String that identifies the interface")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="speed-value" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="speed-units" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vlan-description" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used to describe (the service associated with) the vlan")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="backdoor-connection" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Whether customer is going to use this VLAN for backdoor connection to another customer premise device.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vpn-key" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This indicates the customers VPN ID associated with this vlan")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="prov-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prov Status of the VLAN configuration related to a logical interface. Valid values [PREPROV/NVTPROV/PROV].")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="is-ip-unnumbered" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Flag indicating the interface uses the IP Unnumbered configuration.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="is-private" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Private VLAN indicator.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="5000"/>\r
+        <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vlans">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:vlan" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="sriov-vf">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs",uriTemplate="/sriov-vfs/sriov-vf/{pci-id}",requiredProps="pci-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="pci-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="PCI ID used to identify the sriov-vf")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vf-vlan-filter" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vf-mac-filter" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vf-vlan-strip" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vf-vlan-anti-spoof-check" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vf-mac-anti-spoof-check" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vf-mirrors" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vf-broadcast-allow" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vf-unknown-multicast-allow" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vf-unknown-unicast-allow" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vf-insert-stag" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This option, if set to true, instructs to insert outer tag after traffic comes out of VM.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vf-link-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron network id of the interface")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="sriov-vfs">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of SR-IOV Virtual Functions.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:sriov-vf" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="l-interface">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface",container="l-interfaces",uriTemplate="/l-interfaces/l-interface/{interface-name}",requiredProps="interface-name,is-port-mirrored,in-maint,is-ip-unnumbered")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="interface-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name given to the interface")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="interface-role" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="E.g., CUSTOMER, UPLINK, etc.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="v6-wan-link-ip" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="interface-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ID of interface")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="macaddr" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="MAC address for the interface")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="network-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the network")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="management-option" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Whether A&amp;AI should be managing this interface of not. Could have value like CUSTOMER")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="interface-description" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Human friendly text regarding this interface.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="is-port-mirrored" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not port is a mirrored.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="prov-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prov Status of the logical interface. Valid values [PREPROV/NVTPROV/PROV].")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="is-ip-unnumbered" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Flag indicating the interface uses the IP Unnumbered configuration.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="allowed-address-pairs" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Freeform field for storing an ip address, list of ip addresses or a subnet block.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="priority" type="xs:int" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Priority used for fail-over. Valid values 1-1024, with 1 being the highest priority.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:vlans" minOccurs="0"/>\r
+        <xs:element ref="tns:sriov-vfs" minOccurs="0"/>\r
+        <xs:element ref="tns:l-interfaces" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="5000"/>\r
+        <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="5000"/>\r
+        <xs:element name="admin-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Administrative status of the interface. Valid values are 'up', 'down', or 'testing'.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="l-interfaces">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of logical interfaces.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:l-interface" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vserver">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers",uriTemplate="/vservers/vserver/{vserver-id}",requiredProps="vserver-id,vserver-name,vserver-selflink,in-maint,is-closed-loop-disabled")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="vserver-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier for this vserver relative to its tenant")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vserver-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of vserver")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vserver-name2" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Alternative name of vserver")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="prov-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vserver-selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether closed loop function is enabled on this node")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:volumes" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element ref="tns:l-interfaces" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vservers">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of virtual Servers, aka virtual machines or VMs.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:vserver" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="nos-server">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="nos-server is the execution environment that will have images, certain versions of VNOS, running on it.",indexedProps="nos-server-id",dependentOn="tenant",nameProps="nos-server-name",container="nos-servers",uriTemplate="/nos-servers/nos-server/{nos-server-id}",requiredProps="nos-server-id,nos-server-name,vendor,nos-server-selflink,in-maint")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="nos-server-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier for this nos relative to its tenant")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="nos-server-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of nos")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vendor" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="uCPE vendor")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="prov-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="nos-server-selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="nos-servers">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="nos-server is the execution environment that will have images, certain versions of VNOS, running on it.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:nos-server" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="tenant">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id,tenant-context",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants",uriTemplate="/tenants/tenant/{tenant-id}",requiredProps="tenant-id,tenant-name")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="tenant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id relative to the cloud-region.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="tenant-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Readable name of tenant")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="tenant-context" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This field will store the tenant context.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:vservers" minOccurs="0"/>\r
+        <xs:element ref="tns:nos-servers" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="tenants">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:tenant" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="hpa-feature-attributes">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="HPA Capability Feature attributes",indexedProps="hpa-attribute-key",dependentOn="hpa-capability",requiredProps="hpa-attribute-key")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="hpa-attribute-key" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="name of the specific HPA attribute")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="hpa-attribute-value" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="JSON string specifying the value, unit and type of the specific HPA attribute")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="hpa-capability">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a HPA capability",indexedProps="hpa-feature,architecture,hpa-capability-id",dependentOn="flavor,cloud-region",container="hpa-capabilities",requiredProps="hpa-capability-id,hpa-feature")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="hpa-capability-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID to uniquely identify a HPA capability")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="hpa-feature" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the HPACapability")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="hpa-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="HPA schema version")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="architecture" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Hardware architecture")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element ref="tns:hpa-feature-attributes" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="hpa-capabilities">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of HPA Capabilities")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:hpa-capability" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="flavor">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors",uriTemplate="/flavors/flavor/{flavor-id}",requiredProps="flavor-id,flavor-name,flavor-selflink")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="flavor-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Flavor id, expected to be unique across cloud-region.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="flavor-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Cloud Region Flavor name")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="flavor-vcpus" type="xs:int" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Number of CPUs")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="flavor-ram" type="xs:int" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Amount of memory")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="flavor-disk" type="xs:int" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Disk space")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="flavor-ephemeral" type="xs:int" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Amount of ephemeral disk space")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="flavor-swap" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="amount of swap space allocation")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="flavor-is-public" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="whether flavor is available to all users or private to the tenant it was created in.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="flavor-selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="flavor-disabled" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Boolean as to whether this flavor is no longer enabled")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:hpa-capabilities" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="List of flavor specific HPA Capabilities")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="flavors">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack flavors.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:flavor" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="group-assignment">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments",uriTemplate="/group-assignments/group-assignment/{group-id}",requiredProps="group-id,group-type,group-name")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="group-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Group id, expected to be unique across cloud-region.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="group-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group type - the type of group this instance refers to")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="group-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group name - name assigned to the group")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="group-description" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group description - description of the group")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="group-assignments">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack group assignments")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:group-assignment" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="snapshot">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots",uriTemplate="/snapshots/snapshot/{snapshot-id}",requiredProps="snapshot-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="snapshot-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Snapshot id, this is the key UUID assoc associated in glance with the snapshots.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="snapshot-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Snapshot name")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="snapshot-architecture" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operating system architecture")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="snapshot-os-distro" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="snapshot-os-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The operating system version as specified by the distributor.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="application" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="application-vendor" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="application-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="snapshot-selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="prev-snapshot-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This field contains the UUID of the previous snapshot (if any).")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="snapshots">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack snapshots")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:snapshot" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="metadatum">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata",uriTemplate="/metadata/metadatum/{metaname}",requiredProps="metaname,metaval")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="metaname" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="metaval" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="metadata">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of metadatum (key/value pairs)")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:metadatum" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="image">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images",uriTemplate="/images/image/{image-id}",requiredProps="image-id,image-name,image-os-distro,image-os-version,image-selflink")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="image-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Image id, expected to be unique across cloud region")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="image-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Image name")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="image-architecture" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operating system architecture.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="image-os-distro" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="image-os-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The operating system version as specified by the distributor.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="application" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="application-vendor" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="application-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="image-selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element ref="tns:metadata" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="images">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collectio of Openstack images.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:image" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="availability-zones">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of availability zones")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:availability-zone" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vip-ipv4-address-list">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv4-address-list/{vip-ipv4-address}",requiredProps="vip-ipv4-address")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="vip-ipv4-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vip-ipv4-prefix-length" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prefix length, 32 for single address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="is-floating" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator of fixed or floating address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron network id of the interface that address belongs to")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron id of subnet that address belongs to")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vip-ipv6-address-list">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv6-address-list/{vip-ipv6-address}",requiredProps="vip-ipv6-address")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="vip-ipv6-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vip-ipv6-prefix-length" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prefix length, 128 for single address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="is-floating" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator of fixed or floating address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron network id of the interface that address belongs to")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron id of subnet that address belongs to")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="esr-system-info">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist common address information of external systems.",indexedProps="esr-system-info-id,system-name,system-type",searchable="esr-system-info-id,system-name,system-type",container="esr-system-info-list",dependentOn="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc,ext-aai-network",requiredProps="esr-system-info-id,user-name,password,system-type")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="esr-system-info-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of esr system info.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="system-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="name of external system.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="type of external systems.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vendor" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="vendor of external systems.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="version of external systems.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="service-url" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="url used to access external systems.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="user-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="username used to access external systems.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="password" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="password used to access external systems.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="system-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="it could be vim/vnfm/thirdparty-sdnc/ems-resource/ems-performance/ems-alarm.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="protocol" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="protocol of third party SDNC, for example netconf/snmp.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ssl-cacert" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ca file content if enabled ssl on auth-url.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ssl-insecure" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Whether to verify VIM's certificate.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ip-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="service IP of ftp server.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="port" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="service port of ftp server.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="cloud-domain" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="domain info for authentication.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="default-tenant" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="default tenant of VIM.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="passive" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ftp passive mode or not.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="remote-path" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="resource or performance data file path.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="system-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the status of external system.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="openstack-region-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="OpenStack region ID used by MultiCloud plugin to interact with an OpenStack instance.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="esr-system-info-list">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of persistent block-level external system auth info.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:esr-system-info" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="cloud-region">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&amp;T's AIC.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}",requiredProps="cloud-owner,cloud-region-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="cloud-owner" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="cloud-region-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifier used by the vendor for the region. Second part of composite key")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="cloud-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the cloud (e.g., openstack)")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="owner-defined-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Cloud-owner defined type indicator (e.g., dcp, lcp)")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="cloud-region-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="identity-url" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL of the keystone identity service")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="cloud-zone" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="complex-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="sriov-automation" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Whether the cloud region supports (true) or does not support (false) SR-IOV automation.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="cloud-extra-info" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ESR inputs extra information about the VIM or Cloud which will be decoded by MultiVIM.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:volume-groups" minOccurs="0"/>\r
+        <xs:element ref="tns:tenants" minOccurs="0"/>\r
+        <xs:element ref="tns:flavors" minOccurs="0"/>\r
+        <xs:element ref="tns:group-assignments" minOccurs="0"/>\r
+        <xs:element ref="tns:snapshots" minOccurs="0"/>\r
+        <xs:element ref="tns:images" minOccurs="0"/>\r
+        <xs:element ref="tns:dvs-switches" minOccurs="0"/>\r
+        <xs:element ref="tns:oam-networks" minOccurs="0"/>\r
+        <xs:element ref="tns:availability-zones" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element ref="tns:vip-ipv4-address-list" minOccurs="0" maxOccurs="5000"/>\r
+        <xs:element ref="tns:vip-ipv6-address-list" minOccurs="0" maxOccurs="5000"/>\r
+        <xs:element ref="tns:hpa-capabilities" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="List of cloud-region specific HPA Capabilities")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:esr-system-info-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="cloud-regions">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:cloud-region" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="network-profile">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}",requiredProps="nm-profile-name")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="nm-profile-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique name of network profile.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="community-string" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Encrypted SNMP community string")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="network-profiles">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of network profiles")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:network-profile" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="sriov-pf">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Physical Function",indexedProps="pf-pci-id",dependentOn="p-interface",container="sriov-pfs",uriTemplate="/sriov-pfs/sriov-pf/{pf-pci-id}",requiredProps="pf-pci-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="pf-pci-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifier for the sriov-pf")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="sriov-pfs">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of SR-IOV Physical Functions.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:sriov-pf" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="p-interface">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,networkRef,operational-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="interface-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name that identifies the physical interface")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="speed-value" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="speed-units" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="port-description" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Nature of the services and connectivity on this port.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="equipment-identifier" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="CLEI or other specification for p-interface hardware.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="interface-role" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Role specification for p-interface hardware.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="interface-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates the physical properties of the interface.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="prov-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="mac-addresss" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="MAC Address of the p-interface.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="inv-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="inventory status")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="network-ref" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the network-ref of this p-interface. Derived from ietf-restconf-notification that identifies a termination-point.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="transparent" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the transparent value of this p-interface.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="oper Status of this p-interface.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element ref="tns:sriov-pfs" minOccurs="0"/>\r
+        <xs:element ref="tns:l-interfaces" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="p-interfaces">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical interfaces.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:p-interface" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="lag-interface">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces",uriTemplate="/lag-interfaces/lag-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="interface-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name that identifies the link aggregate interface")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="interface-description" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Human friendly text regarding this interface.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="speed-value" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="speed-units" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="interface-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ID of interface")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="interface-role" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Role assigned to this Interface, should use values as defined in ECOMP Yang models.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="prov-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element ref="tns:l-interfaces" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="lag-interfaces">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of link aggregate interfaces.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:lag-interface" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="hpa-capacity">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="HPA Capacity information for compute node",indexedProps="hpa-capacity-key",dependentOn="hpa-capacity",requiredProps="hpa-capacity-key")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="hpa-capacity-key" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Composite key formed with hpaFeature and append list of hpaFeatureAttributes needed for capacity check")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="hpa-capacity-value" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="JSON string specifying the capacity (total,free), unit and metadata of the specific HPA attribute")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="pserver">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",uniqueProps="hostname",container="pservers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/pservers/pserver/{hostname}",requiredProps="hostname,in-maint")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="hostname" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Value from executing hostname on the compute node.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ptnii-equip-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="PTNII name")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="number-of-cpus" type="xs:int" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Number of cpus")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="disk-in-gigabytes" type="xs:int" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Disk size, in GBs")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ram-in-megabytes" type="xs:int" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="RAM size, in MBs")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="equip-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Equipment type.  Source of truth should define valid values.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="equip-vendor" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Equipment vendor.  Source of truth should define valid values.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="equip-model" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Equipment model.  Source of truth should define valid values.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="fqdn" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Fully-qualified domain name")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="pserver-selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used to configure device, also used for troubleshooting and is IP used for traps generated by device.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="serial-number" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Serial number, may be queried")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipaddress-v4-loopback-0" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IPV4 Loopback 0 address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipaddress-v6-loopback-0" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IPV6 Loopback 0 address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipaddress-v4-aim" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IPV4 AIM address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipaddress-v6-aim" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IPV6 AIM address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipaddress-v6-oam" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IPV6 OAM address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="inv-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="pserver-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ID of Pserver")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="internet-topology" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="internet topology of Pserver")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="pserver-name2" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="alternative pserver name")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="purpose" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="purpose of pserver")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="prov-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="management-option" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates who owns and or manages the device.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="host-profile" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The host profile that defines the configuration of the pserver.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element ref="tns:p-interfaces" minOccurs="0"/>\r
+        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>\r
+        <xs:element ref="tns:hpa-capacity" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="pservers">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of compute hosts.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:pserver" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="virtual-data-center">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}",requiredProps="vdc-id,vdc-name")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="vdc-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vdc")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vdc-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the virtual data center")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="virtual-data-centers">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:virtual-data-center" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="operational-environment">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="It is a logical partition of the cloud which allows to have multiple environments in the production AIC.",indexedProps="operational-environment-id",nameProps="operational-environment-name",uniqueProps="operational-environment-id",container="operational-environments",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/operational-environments/operational-environment/{operational-environment-id}",requiredProps="operational-environment-id,operational-environment-name,operational-environment-type,operational-environment-status,tenant-context,workload-context")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="operational-environment-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of an operational environment")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="operational-environment-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operational Environment name")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="operational-environment-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operational Environment Type.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="operational-environment-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Status")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="tenant-context" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Tenant Context.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="workload-context" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Workload Context.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="operational-environments">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:operational-environment" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="network-technology">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="The network-technology object is used to capture the supported network technologies of a cloud-region.",nameProps="network-technology-id,network-technology-name",uniqueProps="network-technology-id",container="network-technologies",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-technologies/network-technology/{network-technology-id}",requiredProps="network-technology-id,network-technology-name")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="network-technology-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier of the network-technology object (UUID)")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="network-technology-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The network-technology  that a cloud-region can support. Current valid values- CONTRAIL AIC_SR_IOV OVS STANDARD-SR-IOV")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="network-technologies">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description=" The network-technology object is used to capture the supported network technologies of a cloud-region.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:network-technology" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="cloud-infrastructure">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for cloud infrastructure.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:complexes" minOccurs="0"/>\r
+        <xs:element ref="tns:cloud-regions" minOccurs="0"/>\r
+        <xs:element ref="tns:network-profiles" minOccurs="0"/>\r
+        <xs:element ref="tns:pservers" minOccurs="0"/>\r
+        <xs:element ref="tns:virtual-data-centers" minOccurs="0"/>\r
+        <xs:element ref="tns:operational-environments" minOccurs="0"/>\r
+        <xs:element ref="tns:network-technologies" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="esr-ems">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist EMS address information used by EMS driver.",indexedProps="ems-id",searchable="ems-id",container="esr-ems-list",namespace="external-system",requiredProps="ems-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="ems-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of EMS.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:esr-system-info-list" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="esr-ems-list">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:esr-ems" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="esr-vnfm">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist VNFM address information used by VF-C.",indexedProps="vnfm-id",searchable="vnfm-id",container="esr-vnfm-list",namespace="external-system",requiredProps="vnfm-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="vnfm-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of VNFM.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vim-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="indecate the VIM to deploy VNF.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="certificate-url" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="certificate url of VNFM.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:esr-system-info-list" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="esr-vnfm-list">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:esr-vnfm" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="esr-thirdparty-sdnc">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="thirdparty-sdnc-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of SDNC.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="location" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="used for DC type to indicate the location of SDNC, such as Core or Edge.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="product-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="password used to access SDNC server.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:esr-system-info-list" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="esr-thirdparty-sdnc-list">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:esr-thirdparty-sdnc" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="external-system">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for external system.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:esr-ems-list" minOccurs="0"/>\r
+        <xs:element ref="tns:esr-vnfm-list" minOccurs="0"/>\r
+        <xs:element ref="tns:esr-thirdparty-sdnc-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="connector">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business",uriTemplate="/business/connectors/connector/{resource-instance-id}",requiredProps="resource-instance-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="resource-instance-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of resource instance.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element ref="tns:metadata" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="connectors">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:connector" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="tunnel-xconnect">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects",uriTemplate="/tunnel-xconnects/tunnel-xconnect/{id}",requiredProps="id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="tunnel-xconnects">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object is used to store the specific tunnel cross connect aspects of an allotted resource")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:tunnel-xconnect" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="allotted-resource">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description,allotted-resource-name",uniqueProps="id",indexedProps="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",dependentOn="service-instance",container="allotted-resources",uriTemplate="/allotted-resources/allotted-resource/{id}",requiredProps="id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="description" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The descriptive information assigned to this allotted resource instance")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Link back to more information in the controller")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Generic description of the type of allotted resource.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="role" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="role in the network that this resource will be providing.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="allotted-resource-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the name of this allotted-resource.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="access-provider-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access provider of this allotted-resource.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="access-client-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access client of this allotted-resource.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="access-topology-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access topology of this allotted-resource.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="access-node-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access node of this allotted-resource.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="access-ltp-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access ltp of this allotted-resource.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="cvlan" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the cvlan of this allotted-resource.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vpn-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the vpn-name of this allotted-resource.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:tunnel-xconnects" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="allotted-resources">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object is used to store slices of services being offered")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:allotted-resource" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="service-instance">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}",requiredProps="service-instance-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="service-instance-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this instance of a service")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="service-instance-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This field will store a name assigned to the service-instance.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="service-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of service.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="service-role" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing the service role.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="environment-context" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This field will store the environment context assigned to the service-instance.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="workload-context" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This field will store the workload context assigned to the service-instance.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="created-at" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="create time of Network Service.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="updated-at" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="last update of Network Service.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="description" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="short description for service-instance.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="bandwidth-total" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates the total bandwidth to be used for this service.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vhn-portal-url" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL customers will use to access the vHN Portal.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="service-instance-location-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="An identifier that customers assign to the location where this service is being used.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this service.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="input-parameters" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing request parameters from SO to pass to Closed Loop.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element ref="tns:metadata" minOccurs="0"/>\r
+        <xs:element ref="tns:allotted-resources" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="service-instances">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of service instances")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:service-instance" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="service-subscription">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type",uriTemplate="/service-subscriptions/service-subscription/{service-type}",requiredProps="service-type")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="service-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Value defined by orchestration to identify this service across ECOMP.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="temp-ub-sub-account-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This property will be deleted from A&amp;AI in the near future. Only stop gap solution.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:service-instances" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="service-subscriptions">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of objects that group service instances.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:service-subscription" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="customer">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business",uriTemplate="/business/customers/customer/{global-customer-id}",requiredProps="global-customer-id,subscriber-name,subscriber-type")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="global-customer-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Global customer id used across ECOMP to uniquely identify customer.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="subscriber-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Subscriber name, an alternate way to retrieve a customer.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="subscriber-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Subscriber type, a way to provide VID with only the INFRA customers.",defaultValue="CUST")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:service-subscriptions" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="customers">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:customer" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="line-of-business">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a line-of-business",indexedProps="line-of-business-name",uniqueProps="line-of-business-name",container="lines-of-business",namespace="business",uriTemplate="/business/lines-of-business/line-of-business/{line-of-business-name}",requiredProps="line-of-business-name")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="line-of-business-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the line-of-business (product)")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="lines-of-business">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of lines-of-business")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:line-of-business" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="owning-entity">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes an owning-entity",indexedProps="owning-entity-id,owning-entity-name",searchable="owning-entity-id",uniqueProps="owning-entity-id,owning-entity-name",container="owning-entities",namespace="business",uriTemplate="/business/owning-entities/owning-entity/{owning-entity-id}",requiredProps="owning-entity-id,owning-entity-name")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="owning-entity-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of an owning entity")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="owning-entity-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Owning entity name")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="owning-entities">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of owning-entities")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:owning-entity" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="platform">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a platform",indexedProps="platform-name",uniqueProps="platform-name",container="platforms",namespace="business",uriTemplate="/business/platforms/platform/{platform-name}",requiredProps="platform-name")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="platform-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the platform")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="platforms">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of platforms")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:platform" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="project">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes the project",indexedProps="project-name",uniqueProps="project-name",container="projects",namespace="business",uriTemplate="/business/projects/project/{project-name}",requiredProps="project-name")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="project-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the project deploying a service")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="projects">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of projects")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:project" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="sp-partner">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an sp-partner",indexedProps="sp-partner-id,url,callsource",nameProps="sp-partner-id",searchable="sp-partner-id",uniqueProps="sp-partner-id",container="sp-partners",namespace="business",uriTemplate="/business/sp-partners/sp-partner/{sp-partner-id}",requiredProps="sp-partner-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="sp-partner-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this sp-partner by id")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="url" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the URL of this sp-partner.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="callsource" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the callsource of this sp-partner.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this sp-partner.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this sp-partner.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this sp-partner model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this sp-partner model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="sp-partners">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of sp-partners")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:sp-partner" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="business">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for business related constructs")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:connectors" minOccurs="0"/>\r
+        <xs:element ref="tns:customers" minOccurs="0"/>\r
+        <xs:element ref="tns:lines-of-business" minOccurs="0"/>\r
+        <xs:element ref="tns:owning-entities" minOccurs="0"/>\r
+        <xs:element ref="tns:platforms" minOccurs="0"/>\r
+        <xs:element ref="tns:projects" minOccurs="0"/>\r
+        <xs:element ref="tns:sp-partners" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vnf-image">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}",requiredProps="vnf-image-uuid,application,application-vendor")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="vnf-image-uuid" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of this asset")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="application" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="application-vendor" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="application-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vnf-images">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:vnf-image" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="service">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/services/service/{service-id}",requiredProps="service-id,service-description")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="service-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="service-description" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Description of the service")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="service-selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="service-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="service version")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="services">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:service" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="service-capability">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}",requiredProps="service-type,vnf-type")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="service-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="service-capabilities">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of service capabilities.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:service-capability" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="element-choice-set">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets",uriTemplate="/element-choice-sets/element-choice-set/{element-choice-set-uuid}",requiredProps="element-choice-set-uuid,element-choice-set-name")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="element-choice-set-uuid" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="element-choice-set-name" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="cardinality" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>\r
+        <xs:element ref="tns:model-elements" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="element-choice-sets">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:element-choice-set" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="constrained-element-set">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets",uriTemplate="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}",requiredProps="constrained-element-set-uuid,constraint-type,check-type")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="constrained-element-set-uuid" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="constraint-type" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="check-type" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>\r
+        <xs:element ref="tns:element-choice-sets" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="constrained-element-sets">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:constrained-element-set" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="model-constraint">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints",uriTemplate="/model-constraints/model-constraint/{model-constraint-uuid}",requiredProps="model-constraint-uuid,constrained-element-set-uuid-to-replace")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="model-constraint-uuid" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string" minOccurs="0"/>\r
+        <xs:element ref="tns:constrained-element-sets" minOccurs="0"/>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="model-constraints">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:model-constraint" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="model-element">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements",uriTemplate="/model-elements/model-element/{model-element-uuid}",requiredProps="model-element-uuid,new-data-del-flag,cardinality")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="model-element-uuid" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="new-data-del-flag" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates whether this element was created as part of instantiation from this model")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="cardinality" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="How many of this type of element are required/allowed")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="linkage-points" type="xs:string" minOccurs="0" maxOccurs="5000"/>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:model-elements" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:model-constraints" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Describes new constraints on this model element that are not part of that model's definition")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="model-elements">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:model-element" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="model-ver">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version,distribution-status",uniqueProps="model-version-id",container="model-vers",uriTemplate="/model-vers/model-ver/{model-version-id}",requiredProps="model-version-id,model-name,model-version")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="distribution-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Distribution Status")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-description" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Description")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:model-elements" minOccurs="0"/>\r
+        <xs:element ref="tns:metadata" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="model-vers">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:model-ver" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="model">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/models/model/{model-invariant-id}",requiredProps="model-invariant-id,model-type")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:model-vers" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="models">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:model" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="related-lookup">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups",requiredProps="related-lookup-uuid,source-node-type,source-node-property,target-node-type,target-node-property")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="related-lookup-uuid" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="source-node-type" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="source-node-property" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="target-node-type" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="target-node-property" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="5000"/>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="related-lookups">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:related-lookup" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="property-constraint">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints",requiredProps="property-constraint-uuid,constraint-type,property-name,property-value")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="property-constraint-uuid" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="constraint-type" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="property-name" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="property-value" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="property-constraints">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:property-constraint" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="named-query-element">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements",requiredProps="named-query-element-uuid")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="named-query-element-uuid" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="5000"/>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="property-limit-desc" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="do-not-output" type="xs:string" minOccurs="0"/>\r
+        <xs:element ref="tns:named-query-elements" minOccurs="0"/>\r
+        <xs:element ref="tns:related-lookups" minOccurs="0"/>\r
+        <xs:element ref="tns:property-constraints" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="named-query-elements">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:named-query-element" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="named-query">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation",requiredProps="named-query-uuid,named-query-name,named-query-version")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="named-query-uuid" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="named-query-name" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="named-query-version" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="required-input-params" minOccurs="0">\r
+          <xs:complexType>\r
+            <xs:sequence>\r
+              <xs:element name="required-input-param" type="xs:string" minOccurs="0" maxOccurs="5000"/>\r
+            </xs:sequence>\r
+          </xs:complexType>\r
+        </xs:element>\r
+        <xs:element name="description" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>\r
+        <xs:element ref="tns:named-query-elements" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="named-queries">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:named-query" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="service-design-and-creation">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for objects managed by ASDC")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:vnf-images" minOccurs="0"/>\r
+        <xs:element ref="tns:services" minOccurs="0"/>\r
+        <xs:element ref="tns:service-capabilities" minOccurs="0"/>\r
+        <xs:element ref="tns:models" minOccurs="0"/>\r
+        <xs:element ref="tns:named-queries" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="logical-link">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose,operational-status",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",uriTemplate="/network/logical-links/logical-link/{link-name}",requiredProps="link-name,in-maint,link-type")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="link-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="link-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of logical link, e.g., evc")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="speed-value" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="speed-units" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ip-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="v4, v6, or ds for dual stack")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="routing-protocol" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="For example, static or BGP")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indication of operational status of the logical link.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="prov-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="link-role" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indication of the network use of the logical link.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="link-name2" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Alias or alternate name (CLCI or D1 name).")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="link-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="UUID of the logical-link, SDNC generates this.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="circuit-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Circuit id")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="purpose" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Reason for this entity, role it is playing")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="logical-links">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of logical connections")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:logical-link" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="class-of-service">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service",uriTemplate="/classes-of-service/class-of-service/{cos}")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="cos" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="probe-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="identifier of probe")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="probe-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="type of probe")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="classes-of-service">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="class-of-service of probe")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:class-of-service" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="site-pair">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs",uriTemplate="/site-pairs/site-pair/{site-pair-id}")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="site-pair-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="source-ip" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prefix address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="destination-ip" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prefix address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ip-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ip version, v4, v6")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="destination-hostname" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Hostname of the destination equipment to which SLAs are measured against.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="destination-equip-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The type of destinatination equipment. Could be Router, UCPE, etc.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:classes-of-service" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="site-pairs">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="probe within a set")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:site-pair" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="routing-instance">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances",uriTemplate="/routing-instances/routing-instance/{routing-instance-id}")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="routing-instance-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of routing instance")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="rpm-owner" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="rpm owner")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:site-pairs" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="routing-instances">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="set of probes related to generic-vnf routing instance")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:routing-instance" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="site-pair-set">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network",uriTemplate="/network/site-pair-sets/site-pair-set/{site-pair-set-id}",requiredProps="site-pair-set-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="site-pair-set-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of site pair set.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:routing-instances" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="site-pair-sets">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of sets of instances for probes related to generic-vnf")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:site-pair-set" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="route-target">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true",uriTemplate="/route-targets/route-target/{global-route-target}/{route-target-role}",requiredProps="global-route-target,route-target-role")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="global-route-target" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Number used to identify an RT, globally unique in the network")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="route-target-role" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Role assigned to this route target")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="route-targets">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of route target information")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:route-target" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vpn-binding">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="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",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}",requiredProps="vpn-id,vpn-name")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="vpn-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="VPN ID, globally unique within A&amp;AI")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vpn-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VPN Name")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vpn-platform" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the platform associated with the VPN example AVPN, Mobility")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vpn-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the vpn, should be taken from enumerated/valid values")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vpn-region" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="region of customer vpn")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="customer-vpn-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="id for this customer vpn")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="route-distinguisher" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="access-provider-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access provider of this vpn.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="access-client-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access client of this vpn.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="access-topology-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access topology of this vpn.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="src-access-node-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the src-access-node of this vpn.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="src-access-ltp-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the src-access-ltp of this vpn.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="dst-access-node-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the dst-access-node of this vpn.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="dst-access-ltp-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the dst-access-ltp of this vpn.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:route-targets" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="l3-networks relate to vpn-bindings")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vpn-bindings">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:vpn-binding" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vpls-pe">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network",uriTemplate="/network/vpls-pes/vpls-pe/{equipment-name}",requiredProps="equipment-name")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="equipment-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="prov-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address).")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="equipment-role" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Client should send valid enumerated value, e.g., VPLS-PE.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Temporary location for stag to get to VCE")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element ref="tns:p-interfaces" minOccurs="0"/>\r
+        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vpls-pes">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of VPLS Provider Edge routers")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:vpls-pe" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="multicast-configuration">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network",uriTemplate="/network/multicast-configurations/multicast-configuration/{multicast-configuration-id}")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="multicast-configuration-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of multicast configuration.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="multicast-protocol" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="protocol of multicast configuration")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="rp-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="rp type of multicast configuration")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="multicast-configurations">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="multicast configuration of generic-vnf ip-address")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:multicast-configuration" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="cvlan-tag-entry">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag}")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="cvlan-tag" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="See mis-na-virtualization-platform.yang")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="cvlan-tags">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:cvlan-tag-entry" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="port-group">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="interface-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the interface")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron network id of this Interface")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="neutron-network-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron network name of this Interface")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="interface-role" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Role assigned to this Interface, should use values as defined in ECOMP Yang models.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="port-group-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Unique ID for port group in vmware")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="port-group-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Likely to duplicate value of neutron network name")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="switch-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="DVS or standard switch name (should be non-null for port groups associated with DVS)")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:cvlan-tags" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="port-groups">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:port-group" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="license">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}",requiredProps="group-uuid,resource-uuid")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="group-uuid" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the license group the resource belongs to, should be uuid.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-uuid" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of a license resource. ")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="licenses">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:license" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="entitlement">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements",uriTemplate="/entitlements/entitlement/{group-uuid}/{resource-uuid}",requiredProps="group-uuid,resource-uuid")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="group-uuid" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the entitlement group the resource comes from, should be uuid.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-uuid" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of an entitlement resource. ")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="entitlements">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Entitlements, keyed by group-uuid and resource-uuid, related to license management")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:entitlement" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vce">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="service-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="prov-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="license-key" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="OBSOLETE -  do not use")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="equipment-role" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Network role being played by this VNF")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vpe-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Unique ID of VPE connected to this VCE.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="v6-vce-wan-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Valid v6 IP address for the WAN Link on this router.  Implied length of /64.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Loopback0 address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="entitlement-resource-uuid" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="OBSOLETE -  see child relationships")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:port-groups" minOccurs="0"/>\r
+        <xs:element ref="tns:licenses" minOccurs="0"/>\r
+        <xs:element ref="tns:entitlements" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vces">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:vce" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="cp">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="point of attachment from services or resources to a virtual link or network.",uniqueProps="cp-instance-id",dependentOn="vnfc",container="cps",uriTemplate="/cps/cp/{cp-instance-id}",requiredProps="cp-instance-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="cp-instance-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the connection point.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="port-id" type="xs:int" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="port index to represent multiple CPs on VNFC connected to same network.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="5000"/>\r
+        <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="cps">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of connection points.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:cp" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vnfc">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id",searchable="vnfc-name",container="vnfcs",namespace="network",uriTemplate="/network/vnfcs/vnfc/{vnfc-name}")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="vnfc-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of vnfc.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="nfc-naming-code" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Short code that is used in naming instances of the item being modeled")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="nfc-function" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="prov-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="prov status of this vnfc")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by APP-C")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipaddress-v4-oam-vip" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Oam V4 vip address of this vnfc")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="group-notation" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group notation of VNFC")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element ref="tns:cps" minOccurs="0"/>\r
+        <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="5000"/>\r
+        <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vnfcs">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="virtual network components associated with a vserver from application controller.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:vnfc" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="host-route">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="host-route-id",dependentOn="subnet",container="host-routes",uriTemplate="/host-routes/host-route/{host-route-id}")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="host-route-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="host-route id")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="route-prefix" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="subnet prefix")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="next-hop" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Could be ip-address, hostname, or service-instance")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="next-hop-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Should be ip-address, hostname, or service-instance to match next-hop")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="host-routes">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:host-route" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="subnet">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="subnet-id,subnet-name",nameProps="subnet-name",uniqueProps="subnet-id",dependentOn="l3-network",container="subnets",uriTemplate="/subnets/subnet/{subnet-id}")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="subnet-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Subnet ID, should be UUID.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="subnet-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name associated with the subnet.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron id of this subnet")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="gateway-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="gateway ip address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="network-start-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="network start address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="cidr-mask" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="cidr mask")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ip-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ip version")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="dhcp-enabled" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="dhcp enabled")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="dhcp-start" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the start address reserved for use by dhcp")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="dhcp-end" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the last address reserved for use by dhcp")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="subnet-role" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="role of the subnet, referenced when assigning IPs")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ip-assignment-direction" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ip address assignment direction of the subnet")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="subnet-sequence" type="xs:int" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="sequence of the subnet")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:host-routes" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="subnets">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:subnet" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="ctag-assignment">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vlan-id-inner",dependentOn="l3-network",container="ctag-assignments",uriTemplate="/ctag-assignments/ctag-assignment/{vlan-id-inner}")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="id.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="ctag-assignments">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:ctag-assignment" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="segmentation-assignment">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments",uriTemplate="/segmentation-assignments/segmentation-assignment/{segmentation-id}",requiredProps="segmentation-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="segmentation-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="segmentation-assignments">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack segmentation assignments")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:segmentation-assignment" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="aggregate-route">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="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. ",uniqueProps="route-id",container="aggregate-routes",dependentOn="l3-network",uriTemplate="/aggregate-routes/aggregate-route/{route-id}",requiredProps="route-id,network-start-address,cidr-mask,ip-version")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="route-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of the aggregate-route instance")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="network-start-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the forwarding-path")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="cidr-mask" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="CIDR-mask for aggregate route subnet")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ip-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Identifies is aggregate route is ipv4 or ipv6")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="aggregate-routes">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of aggregate routes.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:aggregate-route" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="l3-network">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="network-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Network ID, should be uuid. Unique across A&amp;AI.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="network-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the network, governed by some naming convention..")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="network-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the network - who defines these values?")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="network-role" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Role the network plans - who defines these values?")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="network-technology" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Network technology - who defines these values?")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron network id of this Interface")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="is-bound-to-vpn" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Set to true if bound to VPN")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="service-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="network-role-instance" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="network role instance")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="contrail-network-fqdn" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Contrail FQDN for the network")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="physical-network-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name associated with the physical network.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="is-provider-network" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a provider network.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="is-shared-network" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a shared network.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="is-external-network" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is an external network.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="is-trunked" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Trunked network indication.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:subnets" minOccurs="0"/>\r
+        <xs:element ref="tns:ctag-assignments" minOccurs="0"/>\r
+        <xs:element ref="tns:segmentation-assignments" minOccurs="0"/>\r
+        <xs:element ref="tns:aggregate-routes" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="l3-networks">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:l3-network" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="network-policy">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network",uriTemplate="/network/network-policies/network-policy/{network-policy-id}")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="network-policy-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID representing unique key to this instance")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="network-policy-fqdn" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Contrail FQDN for the policy")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ID for the openStack Heat instance")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="network-policies">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:network-policy" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vf-module">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules",uriTemplate="/vf-modules/vf-module/{vf-module-id}",requiredProps="vf-module-id,is-base-vf-module,automated-assignment")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="vf-module-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of vf-module.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vf-module-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of vf-module")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Heat stack id corresponding to this instance.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="orchestration status of this vf-module, mastered by MSO")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="is-base-vf-module" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is base vf module")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="automated-assignment" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Indicates whether vf-module assignment was done via automation or manually")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="contrail-service-instance-fqdn" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the Contrail unique ID for a service-instance")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="module-index" type="xs:int" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vf-modules">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of vf-modules, a deployment unit of VNFCs")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:vf-module" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="generic-vnf">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role",searchable="vnf-id,vnf-name,vnf-name2,operational-status",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs",uriTemplate="/network/generic-vnfs/generic-vnf/{vnf-id}",requiredProps="vnf-id,vnf-type,in-maint,is-closed-loop-disabled")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vnf-instance-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="vnf instance id.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="service-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="prov-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.",suggestibleOnSearch="true")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path.",suggestibleOnSearch="true")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="license-key" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="OBSOLETE -  do not use")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="equipment-role" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Client should send valid enumerated value")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this VNF, used by MSO.",suggestibleOnSearch="true")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vnf-package-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vnf-discriptor-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="vnf discriptor name")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="job-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="job id corresponding to vnf")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="management-option" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="identifier of managed by ATT or customer")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="v4 Loopback0 address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="nm-lan-v6-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="v6 Loopback address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="management-v6-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="v6 management address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vcpu" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vcpu-units" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vmemory" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vmemory-units" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vdisk" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only uCPE")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vdisk-units" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="nshd" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="number of associated SHD in vnf.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="nvm" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="number of vms in vnf.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="nnet" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="number of network in vnf.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="summary-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="details regarding the generic-vnf operation, PLEASE DISCONTINUE USE OF THIS FIELD.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="encrypted-access-flag" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="indicates whether generic-vnf access uses SSH")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="entitlement-assignment-group-uuid" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="UUID of the Entitlement group used for licensing VNFs, OBSOLETE -  See child relationships.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="entitlement-resource-uuid" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="UUID of the specific entitlement resource.  OBSOLETE -  See child relationships.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="license-assignment-group-uuid" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="UUID of the license assignment group.  OBSOLETE -  See child relationships.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="license-key-uuid" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="UUID of the actual license resource.  OBSOLETE -  See child relationships.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="as-number" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="as-number of the VNF")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="regional-resource-subzone" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="represents sub zone of the rr plane")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="nf-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Generic description of the type of NF",suggestibleOnSearch="true")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="nf-function" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="English description of Network function that the specific VNF deployment is providing")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="nf-role" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="role in the network that this model will be providing",suggestibleOnSearch="true")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="nf-naming-code" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="string assigned to this model used for naming purposes")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Gateway address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prefix length for oam-address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Temporary location for S-TAG to get to VCE")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="nm-profile-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Network Management profile of this VNF")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element ref="tns:l-interfaces" minOccurs="0"/>\r
+        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>\r
+        <xs:element ref="tns:vf-modules" minOccurs="0"/>\r
+        <xs:element ref="tns:licenses" minOccurs="0"/>\r
+        <xs:element ref="tns:entitlements" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="generic-vnfs">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of VNFs")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:generic-vnf" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="lag-link">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network",uriTemplate="/network/lag-links/lag-link/{link-name}",requiredProps="link-name")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="link-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Alphabetical concatenation of lag-interface names")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="lag-links">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of link aggregation connections")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:lag-link" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="newvce">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network",uriTemplate="/network/newvces/newvce/{vnf-id2}",requiredProps="vnf-id2,vnf-name,vnf-type")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="vnf-id2" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF, can't use same attribute name right now until we promote this new object")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="prov-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="license-key" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="OBSOLETE -  do not use")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address).")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="equipment-role" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Client should send valid enumerated value.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="v4 Loopback0 address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element ref="tns:l-interfaces" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="newvces">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:newvce" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="software-version">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="softwareVersionId,isActiveSwVer",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="software-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifier of the software version")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="is-active-sw-ver" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this software-version is the active one (activeSw = true)")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="software-versions">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of software versions.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:software-version" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vrf">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vrf",indexedProps="vrf-id",nameProps="vrf-name",dependentOn="pnf",container="vrfs",uriTemplate="/vrfs/vrf/{vrf-id}",requiredProps="vrf-id,vrf-name")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="vrf-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="VRF UUID.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vrf-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VRF Name")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vrf-description" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VRF Description")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="route-distinguisher" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Route Distinguisher")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vrf-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The type of vrf (bridge-domain as an example)")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vrf-address-family" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IP address family (v6/v4/both)")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:route-targets" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vrfs">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:vrf" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="pnf">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id,operational-status,admin-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="pnf-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique name of Physical Network Function.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="pnf-name2" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="name of Physical Network Function.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="pnf-name2-source" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="source of name2")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="pnf-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="id of pnf")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="equip-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Equipment type.  Source of truth should define valid values.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="equip-vendor" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Equipment vendor.  Source of truth should define valid values.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="equip-model" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Equipment model.  Source of truth should define valid values.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="management-option" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="identifier of managed by ATT or customer")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this pnf")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipaddress-v4-oam" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ipv4-oam-address with new naming convention for IP addresses")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="sw-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="sw-version is the version of SW for the hosted application on the PNF.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="frame-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ID of the physical frame (relay rack) where pnf is installed.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="serial-number" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Serial number of the device")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipaddress-v4-loopback-0" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IPV4 Loopback 0 address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipaddress-v6-loopback-0" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IPV6 Loopback 0 address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipaddress-v4-aim" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IPV4 AIM address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipaddress-v6-aim" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IPV6 AIM address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipaddress-v6-oam" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IPV6 OAM address")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="inv-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="prov-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="nf-role" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Nf Role is the role performed by this instance in the network.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="admin-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="admin Status of this PNF")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The ASDC model id for this resource  model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The ASDC model version for this resource  model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="pnf-ipv4-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This is the IP address (IPv4) for the PNF itself. This is the IPv4 address that the PNF iself can be accessed at.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="pnf-ipv6-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This is the IP address (IPv6) for the PNF itself. This is the IPv6 address that the PNF iself can be accessed at.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:software-versions" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element ref="tns:p-interfaces" minOccurs="0"/>\r
+        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>\r
+        <xs:element ref="tns:vrfs" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="pnfs">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:pnf" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="physical-link">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id",uriTemplate="/network/physical-links/physical-link/{link-name}",requiredProps="link-name")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="link-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="speed-value" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="speed-units" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="circuit-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Circuit it")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="dual-mode" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Dual access mode (e.g., primary, secondary")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="management-option" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="service-provider-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the service Provider on this link.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="service-provider-bandwidth-up-value" type="xs:int" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Upstream Bandwidth value agreed with the service provider")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="service-provider-bandwidth-up-units" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Units for the upstream BW value")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="service-provider-bandwidth-down-value" type="xs:int" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Downstream Bandwidth value agreed with the service provider")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="service-provider-bandwidth-down-units" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Units for downstream BW value")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="physical-links">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:physical-link" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vig-server">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers",uriTemplate="/vig-servers/vig-server/{vig-address-type}",requiredProps="vig-address-type")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="vig-address-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="indicates whether the VIG is for AVPN or INTERNET")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipaddress-v4-vig" type="xs:string" minOccurs="0" maxOccurs="5000">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="v4 IP of the vig server")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipaddress-v6-vig" type="xs:string" minOccurs="0" maxOccurs="5000">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="v6 IP of the vig server")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vig-servers">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:vig-server" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="ipsec-configuration">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network",uriTemplate="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}",requiredProps="ipsec-configuration-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="ipsec-configuration-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of this configuration")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="requested-vig-address-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicate the type of VIG server like AVPN, INTERNET, BOTH")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="requested-encryption-strength" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="requested-dmz-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ATT can offer a shared DMZ or a DMZ specific to a customer")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="shared-dmz-network-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Network address of shared DMZ")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="requested-customer-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="If the DMZ is a custom DMZ, this field will indicate the customer information")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ike-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="can be 1 or 2")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ikev1-authentication" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Contains values like md5, sha1, sha256, sha384")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ikev1-encryption" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ikev1-dh-group" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ikev1-am-group-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group name defined in VIG for clients using aggressive mode")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ikev1-am-password" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="pre-shared key for the above group name ")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ikev1-sa-lifetime" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Lifetime for IKEv1 SA")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipsec-authentication" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="md5, sha1, sha256, sha384")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipsec-encryption" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipsec-sa-lifetime" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Life time for IPSec SA")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipsec-pfs" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="enable PFS or not")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="xauth-userid" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="user ID for xAuth, sm-user,ucpeHostName,nmteHostName")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="xauth-user-password" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Encrypted using the Juniper $9$ algorithm")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="dpd-interval" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The time between DPD probe")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="dpd-frequency" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Maximum number of DPD before claiming the tunnel is down")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element ref="tns:vig-servers" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="ipsec-configurations">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:ipsec-configuration" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="route-table-reference">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network",uriTemplate="/network/route-table-references/route-table-reference/{route-table-reference-id}",requiredProps="route-table-reference-id,route-table-reference-fqdn")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="route-table-reference-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="route-table-reference-fqdn" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="FQDN entry in the route table.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="route-table-references">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack route table references")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:route-table-reference" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="instance-group">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,description,instance-group-type")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Instance Group ID, UUID assigned to this instance.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="instance-group-role" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="role of the instance group.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ASDC model version uid for this resource model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="description" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Descriptive text to help identify the usage of this instance-group")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="instance-group-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="instance-group-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Instance-Group Name.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="instance-group-function" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Instance-Group Function")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="instance-groups">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack route table references")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:instance-group" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="zone">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network",uriTemplate="/network/zones/zone/{zone-id}",requiredProps="zone-id,zone-name,design-type,zone-context")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="zone-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Code assigned by AIC to the zone")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="zone-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="English name associated with the zone")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="design-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Design of zone [Medium/Large…]")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="zone-context" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Context of zone [production/test]")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Status of a zone.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="zones">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of zones")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:zone" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vlan-mapping">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vlan-mapping object is an optional child object of the forwarder-evc object.  A given forwarder-evc object may have multiple vlan-mapping objects.",dependentOn="forwarder-evc",uniqueProps="vlan-mapping-id",container="vlan-mappings",uriTemplate="/vlan-mappings/vlan-mapping/{vlan-mapping-id}",requiredProps="vlan-mapping-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="vlan-mapping-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Key for vlan-mapping object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="uni-cvlan" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="CVLAN value from the UNI/ingress side of the SAREA gateway access device.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="nni-svlan" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="SVLAN value from the NNI/egress side of the SAREA gateway access device.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="nni-cvlan" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="CVLAN value from the NNI/egress side of the SAREA gateway access device.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ivlan" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The internal VLAN ('IVLAN') value.  Specific to Arista devices.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vlan-mappings">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of vlan mappings.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:vlan-mapping" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="forwarder-evc">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="forwarder object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="forwarder-evc-id",container="forwarder-evcs",uriTemplate="/forwarder-evcs/forwarder-evc/{forwarder-evc-id}",requiredProps="forwarder-evc-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="forwarder-evc-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Key for forwarder-evc object")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="circuit-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Circuit ID from customer/ESP/ingress end of EVC, or reference to beater circuit on gateway/network/egress end of EVC")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ivlan" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Internal VLAN.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="svlan" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="SVLAN value for ingress of egress forwarder.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="cvlan" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="CVLAN value for ingress of egress forwarder.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:vlan-mappings" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="forwarder-evcs">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:forwarder-evc" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="evc">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="evc object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="evc-id",container="evcs",uriTemplate="/evcs/evc/{evc-id}",requiredProps="evc-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="evc-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique/key field for the evc object")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="forwarding-path-topology" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Point-to-Point, Multi-Point")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="cir-value" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Commited Information Rate")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="cir-units" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="CIR units")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="connection-diversity-group-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Diversity Group ID")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="service-hours" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="formerly Performance Group")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="esp-evc-circuit-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="EVC Circuit ID of ESP EVC")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="esp-evc-cir-value" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Committed Information Rate (For ESP)")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="esp-evc-cir-units" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="CIR units (For ESP)")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="esp-itu-code" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Identifies ESP")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="collector-pop-clli" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Collector POP CLLI (from the hostname of the access pnf)")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="inter-connect-type-ingress" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Interconnect type on ingress side of EVC.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="tagmode-access-ingress" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="tagode for collector side of EVC")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="tagmode-access-egress" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="tagMode for network side of EVC")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="evcs">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:evc" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="configuration">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic configuration object.",indexedProps="configuration-id,model-invariant-id,model-version-id",uniqueProps="configuration-id",container="configurations",namespace="network",uriTemplate="/network/configurations/configuration/{configuration-id}",requiredProps="configuration-id,configuration-type")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="configuration-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID assigned to configuration.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="management-option" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="configuration-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the configuration.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="configuration-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="port-mirroring-configuration.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="configuration-sub-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="vprobe, pprobe.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of the configuration.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="configuration-selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details from SDN-GC.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="id of  the configuration used to customize the resource")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="tunnel-bandwidth" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="DHV Site Effective Bandwidth")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vendor-allowed-max-bandwidth" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Velocloud Nominal Throughput - VNT")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="config-policy-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used to capture the name of the fabric configuration policy that was used to generate the payload sent to PINC for fabric configuration.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element ref="tns:metadata" minOccurs="0"/>\r
+        <xs:element ref="tns:forwarder-evcs" minOccurs="0"/>\r
+        <xs:element ref="tns:evcs" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="configurations">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of configurations")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:configuration" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="forwarder">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="sequence",description="Entity describing a sequenced segment of forwarding path",container="forwarders",dependentOn="forwarding-path",uriTemplate="/forwarders/forwarder/{sequence}",requiredProps="sequence")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="sequence" type="xs:int" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of this segmentation")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="forwarder-role" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ingress, intermediate, egress")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="forwarders">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:forwarder" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="forwarding-path">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",indexedProps="forwarding-path-id,forwarding-path-name",description="Entity that describes the sequenced forwarding path between interfaces of services or resources",container="forwarding-paths",nameProps="forwarding-path-name",uniqueProps="forwarding-path-id",uriTemplate="/network/forwarding-paths/forwarding-path/{forwarding-path-id}",requiredProps="forwarding-path-id,forwarding-path-name")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="forwarding-path-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of this FP")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="forwarding-path-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the FP")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the self link for this FP")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:forwarders" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="forwarding-paths">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:forwarding-path" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="collection">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",description="represents the collection resource in the TOSCA model",uniqueProps="collection-id",indexedProps="collection-id,model-invariant-id,model-version-id",container="collections",uriTemplate="/network/collections/collection/{collection-id}",requiredProps="collection-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="collection-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Collection Object UUID")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ASDC model id for this resource or service model",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Model Version",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="collection-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="collection name")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="collection-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Collection type")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="collection-role" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Collection Role")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="collection-function" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Collection function")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="orchestration status")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="collection-customization-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the id of all the configuration used to customize the resource for the service")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="collections">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:collection" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vlan-tag">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",container="vlan-tags",uniqueProps="vlan-tag-id",uriTemplate="/network/vlan-tags/vlan-tag/{vlan-tag-id}")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="vlan-tag-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vlan-tag")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vlan-tag-role" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="purpose (l3-network to be connected to)")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vlan-id-inner" type="xs:int" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN inner id")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vlan-id-outer" type="xs:int" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN outer id")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="is-private" type="xs:boolean" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="is VLAN private?")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vlan-tags">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:vlan-tag" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="connectivity">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a connectivity",indexedProps="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",nameProps="etht-svc-name",searchable="connectivity-id",uniqueProps="connectivity-id",container="connectivities",namespace="network",requiredProps="connectivity-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="connectivity-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this connectivity by id")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="bandwidth-profile-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the name of a bandwidth profile.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vpn-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the type of a bandwidth profile.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="cir" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the CIR of this connectivity.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="eir" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the EIR of this connectivity.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="cbs" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the CBS of this connectivity.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ebs" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the EBS of this connectivity.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="color-aware" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the color-awareness of this connectivity.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="coupling-flag" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the coupling flag of this connectivity.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="etht-svc-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The ethernet service name for this connectivity.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="access-provider-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access provider of this connectivity.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="access-client-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access client of this connectivity.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="access-topology-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access topology of this connectivity.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="access-node-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access node of this connectivity.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="access-ltp-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access ltp of this connectivity.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="connectivity-selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the link to get more information for this connectivity.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="cvlan" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the cvlan for this connectivity.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="connectivities">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of connectivities")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:connectivity" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="dhcp-service">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a dhcp-service",indexedProps="dhcp-service-id,dhcp-service-type,domain-name,server-ipv4-address,server-ipv6-address",nameProps="domain-name",searchable="dhcp-service-id",uniqueProps="dhcp-service-id",container="dhcp-services",dependentOn="lan-port-config",namespace="network",requiredProps="dhcp-service-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="dhcp-service-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this dhcp-service by id")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="server-ipv4-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the server-ip4-address of this dhcp-service.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="server-ipv6-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the server-ipv6-address of this dhcp-service.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="service-enable" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the service-enable of this dhcp-service.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="dhcp-service-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the dhcp-service-type of this dhcp-service.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="lease-time" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the lease-time of this dhcp-service.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="domain-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the domain-name of this dhcp-service.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="dns" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the dns of this dhcp-service.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ntp-primary" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ntp-primary of this dhcp-service.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ntp-secondary" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ntp-secondary of this dhcp-service.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="nbns" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the nbns of this dhcp-service.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="dhcp-services">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of dhcp-services")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:dhcp-service" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="lan-port-config">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a lan-port-config",indexedProps="lan-port-config-id,lan-port-config-name,device-id,port-id,ipv4-address,ipv6-address,vlan-tag",nameProps="lan-port-config-name",searchable="lan-port-config-id",uniqueProps="lan-port-config-id",container="lan-port-configs",namespace="network",requiredProps="lan-port-config-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="lan-port-config-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this lan-port-config by id")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="lan-port-config-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the name of this lan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="description" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the description of this lan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="device-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the device-id of this lan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="port-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the port-id of this lan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipv4-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ipv4-address of this lan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipv6-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ipv6-address of this lan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vlan-tag" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the vlan-tag of this lan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="input-bandwidth" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the input-bandwidth of this lan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="output-bandwidth" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the output-bandwidth of this lan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:dhcp-services" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="lan-port-configs">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of lan-port-configs")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:lan-port-config" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="network-resource">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a network-resource",indexedProps="network-id,provider-id,client-id,te-topo-id",nameProps="network-id",searchable="network-id",uniqueProps="network-id",container="network-resources",namespace="network",requiredProps="network-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="network-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this network-resource by id")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="provider-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the provider of this network-resource.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="client-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the client of this network-resource.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="te-topo-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the te-topo of this network-resource.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="network-resources">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of network-resources")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:network-resource" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="site-resource">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a site-resource",indexedProps="site-resource-id,site-resource-name,type,role,generated-site-id,operational-status",nameProps="site-resource-name",searchable="site-resource-id",uniqueProps="site-resource-id",container="site-resources",namespace="network",requiredProps="site-resource-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="site-resource-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this site-resource by id")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="site-resource-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the name of this site-resource.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="description" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the description of this site-resource.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the type of this site-resource.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="role" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the role of this site-resource.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="generated-site-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the generated-site-id of this site-resource.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="site-resources">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of site-resources")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:site-resource" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="sdwan-vpn">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an sdwan-vpn",indexedProps="sdwan-vpn-id,sdwan-vpn-name,vxlan-id,topology,operational-status",nameProps="sdwan-vpn-name",searchable="sdwan-vpn-id",uniqueProps="sdwan-vpn-id",container="sdwan-vpns",namespace="network",requiredProps="sdwan-vpn-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="sdwan-vpn-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this sdwan-vpn by id")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="sdwan-vpn-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the name of this sdwan-vpn.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vxlan-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the vxlan-id of this sdwan-vpn.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="topology" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the topology of this sdwan-vpn.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="tenant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the tenant-id of this sdwan-vpn.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vpn-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the vpn-id of this sdwan-vpn.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="sdwan-vpns">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of sdwan-vpns")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:sdwan-vpn" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="device">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a device",indexedProps="device-id,device-name,esn,vendor,class,type,version,system-ip,system-ipv4,system-ipv6,operational-status",nameProps="device-name",searchable="device-id",uniqueProps="device-id",container="devices",namespace="network",requiredProps="device-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="device-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this device by id")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="esn" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the esn of this device.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="device-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the name of this device.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="description" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the description of this device.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vendor" type="xs:string" minOccurs="0">\r
           <xs:annotation>\r
             <xs:appinfo>\r
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of the aggregate-route instance")</annox:annotate>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the vendor of this device.")</annox:annotate>\r
             </xs:appinfo>\r
           </xs:annotation>\r
-        </xs:element>
-        <xs:element name="network-start-address" type="xs:string" minOccurs="0">
+        </xs:element>\r
+        <xs:element name="class" type="xs:string" minOccurs="0">\r
           <xs:annotation>\r
             <xs:appinfo>\r
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the forwarding-path")</annox:annotate>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the class of this device.")</annox:annotate>\r
             </xs:appinfo>\r
           </xs:annotation>\r
-        </xs:element>
-        <xs:element name="cidr-mask" type="xs:string" minOccurs="0">
+        </xs:element>\r
+        <xs:element name="type" type="xs:string" minOccurs="0">\r
           <xs:annotation>\r
             <xs:appinfo>\r
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="CIDR-mask for aggregate route subnet")</annox:annotate>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the type of this device.")</annox:annotate>\r
             </xs:appinfo>\r
           </xs:annotation>\r
-        </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
+        </xs:element>\r
+        <xs:element name="version" type="xs:string" minOccurs="0">\r
           <xs:annotation>\r
             <xs:appinfo>\r
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Identifies is aggregate route is ipv4 or ipv6")</annox:annotate>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the version of this device.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="system-ip" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the system-ip of this device.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="system-ipv4" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the system-ipv4 of this device.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="system-ipv6" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the system-ipv6 of this device.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>\r
             </xs:appinfo>\r
           </xs:annotation>\r
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+        </xs:element>\r
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
           <xs:annotation>\r
             <xs:appinfo>\r
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
             </xs:appinfo>\r
           </xs:annotation>\r
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="aggregate-routes">
-    <xs:complexType>
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="devices">\r
+    <xs:complexType>\r
       <xs:annotation>\r
         <xs:appinfo>\r
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of aggregate routes.")</annox:annotate>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of devices")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:device" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="wan-port-config">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a wan-port-config",indexedProps="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",nameProps="wan-port-config-name",searchable="wan-port-config-id",uniqueProps="wan-port-config-id",container="wan-port-configs",namespace="network",requiredProps="wan-port-config-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="wan-port-config-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this wan-port-config by id")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="wan-port-config-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the name of this wan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="device-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the device of this wan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="vlan-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the vlan of this wan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ip-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ip-address of this wan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipv4-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ipv4-address of this wan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="ipv6-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ipv6-address of this wan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="provider-ip-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the provider-ip-address of this wan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="provider-ipv4-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the provider-ipv4-address of this wan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="provider-ipv6-address" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the provider-ipv6-address of this wan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="input-bandwidth" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the input-bandwidth of this wan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="output-bandwidth" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the output-bandwidth of this wan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="description" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the description of this wan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="port-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the port-type of this wan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="port-number" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the port-number of this wan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="transport-network-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the transport-network-name of this wan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="device-port-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the device-port-id of this wan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="wan-port-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the wan-port-id of this wan-port-config.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="selflink" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="wan-port-configs">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of wan-port-configs")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:wan-port-config" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="ext-aai-network">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Refer to an external AAI in another ONAP.",indexedProps="aai-id",searchable="aai-id",container="ext-aai-networks",namespace="network",requiredProps="aai-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="aai-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the referenced AAI.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="schema-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Schema version of the referenced AAI.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:esr-system-info" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="ext-aai-networks">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:ext-aai-network" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="network">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for network inventory resources.")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:logical-links" minOccurs="0"/>\r
+        <xs:element ref="tns:site-pair-sets" minOccurs="0"/>\r
+        <xs:element ref="tns:vpn-bindings" minOccurs="0"/>\r
+        <xs:element ref="tns:vpls-pes" minOccurs="0"/>\r
+        <xs:element ref="tns:multicast-configurations" minOccurs="0"/>\r
+        <xs:element ref="tns:vces" minOccurs="0"/>\r
+        <xs:element ref="tns:vnfcs" minOccurs="0"/>\r
+        <xs:element ref="tns:l3-networks" minOccurs="0"/>\r
+        <xs:element ref="tns:network-policies" minOccurs="0"/>\r
+        <xs:element ref="tns:generic-vnfs" minOccurs="0"/>\r
+        <xs:element ref="tns:lag-links" minOccurs="0"/>\r
+        <xs:element ref="tns:newvces" minOccurs="0"/>\r
+        <xs:element ref="tns:pnfs" minOccurs="0"/>\r
+        <xs:element ref="tns:physical-links" minOccurs="0"/>\r
+        <xs:element ref="tns:ipsec-configurations" minOccurs="0"/>\r
+        <xs:element ref="tns:route-table-references" minOccurs="0"/>\r
+        <xs:element ref="tns:instance-groups" minOccurs="0"/>\r
+        <xs:element ref="tns:zones" minOccurs="0"/>\r
+        <xs:element ref="tns:configurations" minOccurs="0"/>\r
+        <xs:element ref="tns:forwarding-paths" minOccurs="0"/>\r
+        <xs:element ref="tns:collections" minOccurs="0"/>\r
+        <xs:element ref="tns:vlan-tags" minOccurs="0"/>\r
+        <xs:element ref="tns:connectivities" minOccurs="0"/>\r
+        <xs:element ref="tns:lan-port-configs" minOccurs="0"/>\r
+        <xs:element ref="tns:network-resources" minOccurs="0"/>\r
+        <xs:element ref="tns:site-resources" minOccurs="0"/>\r
+        <xs:element ref="tns:sdwan-vpns" minOccurs="0"/>\r
+        <xs:element ref="tns:devices" minOccurs="0"/>\r
+        <xs:element ref="tns:wan-port-configs" minOccurs="0"/>\r
+        <xs:element ref="tns:ext-aai-networks" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="reserved-prop-names">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="last-mod-source-of-truth" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="aai-node-type" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="aai-created-ts" type="xs:unsignedInt" minOccurs="0"/>\r
+        <xs:element name="aai-unique-key" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="aai-last-mod-ts" type="xs:unsignedInt" minOccurs="0"/>\r
+        <xs:element name="source-of-truth" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="aai-uri" type="xs:string" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="edge-prop-names">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV",uniqueProps="aai-uuid",indexedProps="aai-uuid")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="edgeLabel" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="direction" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="multiplicityRule" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="contains-other-v" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="delete-other-v" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="SVC-INFRA" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="prevent-delete" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="aai-uuid" type="xs:string" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="aai-internal">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:reserved-prop-names" minOccurs="0" maxOccurs="5000"/>\r
+        <xs:element ref="tns:edge-prop-names" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="contact">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Contacts store the vendor information and have a relationship to the generic-vnf.  In 1902, this will be populated by SDN-GC",uniqueProps="contact-name",container="contacts",namespace="common",nameProps="contact-name,vendor-type",uriTemplate="/common/contacts/contact/{contact-name}",requiredProps="contact-name")</annox:annotate>\r
         </xs:appinfo>\r
       </xs:annotation>\r
-      <xs:sequence>
-        <xs:element ref="tns:aggregate-route" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-network">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Network ID, should be uuid. Unique across A&amp;AI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the network, governed by some naming convention..")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the network - who defines these values?")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Role the network plans - who defines these values?")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-technology" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Network technology - who defines these values?")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Neutron network id of this Interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-bound-to-vpn" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Set to true if bound to VPN")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-role-instance" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="network role instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="contrail-network-fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Contrail FQDN for the network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="physical-network-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name associated with the physical network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-provider-network" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a provider network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-shared-network" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a shared network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-external-network" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is an external network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-trunked" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Trunked network indication.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:subnets" minOccurs="0"/>
-        <xs:element ref="tns:ctag-assignments" minOccurs="0"/>
-        <xs:element ref="tns:segmentation-assignments" minOccurs="0"/>
-        <xs:element ref="tns:aggregate-routes" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-networks">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:l3-network" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-policy">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network",uriTemplate="/network/network-policies/network-policy/{network-policy-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="network-policy-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID representing unique key to this instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-policy-fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Contrail FQDN for the policy")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ID for the openStack Heat instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-policies">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:network-policy" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vf-module">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules",uriTemplate="/vf-modules/vf-module/{vf-module-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vf-module-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of vf-module.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-module-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of vf-module")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Heat stack id corresponding to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="orchestration status of this vf-module, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-base-vf-module" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is base vf module")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="automated-assignment" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Indicates whether vf-module assignment was done via automation or manually")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="contrail-service-instance-fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the Contrail unique ID for a service-instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="module-index" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vf-modules">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of vf-modules, a deployment unit of VNFCs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vf-module" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="generic-vnf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role",searchable="vnf-id,vnf-name,vnf-name2,operational-status",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs",uriTemplate="/network/generic-vnfs/generic-vnf/{vnf-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-instance-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="vnf instance id.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.",suggestibleOnSearch="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path.",suggestibleOnSearch="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="OBSOLETE -  do not use")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Client should send valid enumerated value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this VNF, used by MSO.",suggestibleOnSearch="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-package-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-discriptor-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="vnf discriptor name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="job-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="job id corresponding to vnf")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="identifier of managed by ATT or customer")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="v4 Loopback0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nm-lan-v6-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="v6 Loopback address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-v6-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="v6 management address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vcpu" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vcpu-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vmemory" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vmemory-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vdisk" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only uCPE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vdisk-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nshd" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="number of associated SHD in vnf.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nvm" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="number of vms in vnf.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nnet" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="number of network in vnf.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="summary-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="details regarding the generic-vnf operation, PLEASE DISCONTINUE USE OF THIS FIELD.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="encrypted-access-flag" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="indicates whether generic-vnf access uses SSH")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="entitlement-assignment-group-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="UUID of the Entitlement group used for licensing VNFs, OBSOLETE -  See child relationships.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="entitlement-resource-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="UUID of the specific entitlement resource.  OBSOLETE -  See child relationships.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-assignment-group-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="UUID of the license assignment group.  OBSOLETE -  See child relationships.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-key-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="UUID of the actual license resource.  OBSOLETE -  See child relationships.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="as-number" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="as-number of the VNF")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="regional-resource-subzone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="represents sub zone of the rr plane")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nf-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Generic description of the type of NF",suggestibleOnSearch="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nf-function" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="English description of Network function that the specific VNF deployment is providing")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nf-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="role in the network that this model will be providing",suggestibleOnSearch="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nf-naming-code" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="string assigned to this model used for naming purposes")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Gateway address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prefix length for oam-address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Temporary location for S-TAG to get to VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nm-profile-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Network Management profile of this VNF")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:vf-modules" minOccurs="0"/>
-        <xs:element ref="tns:licenses" minOccurs="0"/>
-        <xs:element ref="tns:entitlements" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="generic-vnfs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of VNFs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:generic-vnf" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-link">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network",uriTemplate="/network/lag-links/lag-link/{link-name}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="link-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Alphabetical concatenation of lag-interface names")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-links">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of link aggregation connections")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:lag-link" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="newvce">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network",uriTemplate="/network/newvces/newvce/{vnf-id2}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF, can't use same attribute name right now until we promote this new object")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="OBSOLETE -  do not use")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Client should send valid enumerated value.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="v4 Loopback0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="newvces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:newvce" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="software-version">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="softwareVersionId,isActiveSwVer",dependentOn="pnf",container="pnf")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="software-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifier of the software version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-active-sw-ver" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this software-version is the active one (activeSw = true)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="software-versions">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of software versions.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:software-version" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vrf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vrf",indexedProps="vrf-id",nameProps="vrf-name",dependentOn="pnf",container="vrfs",uriTemplate="/vrfs/vrf/{vrf-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vrf-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="VRF UUID.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vrf-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VRF Name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vrf-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VRF Description")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="route-distinguisher" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Route Distinguisher")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vrf-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The type of vrf (bridge-domain as an example)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vrf-address-family" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IP address family (v6/v4/both)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:route-targets" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vrfs">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:vrf" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pnf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id,operational-status,admin-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="pnf-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique name of Physical Network Function.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="name of Physical Network Function.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pnf-name2-source" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="source of name2")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pnf-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="id of pnf")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Equipment type.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Equipment vendor.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-model" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Equipment model.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="identifier of managed by ATT or customer")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this pnf")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-oam" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ipv4-oam-address with new naming convention for IP addresses")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="sw-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="sw-version is the version of SW for the hosted application on the PNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="frame-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ID of the physical frame (relay rack) where pnf is installed.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="serial-number" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Serial number of the device")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IPV4 Loopback 0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IPV6 Loopback 0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IPV4 AIM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IPV6 AIM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-oam" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IPV6 OAM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="inv-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nf-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Nf Role is the role performed by this instance in the network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="admin-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="admin Status of this PNF")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The ASDC model id for this resource  model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The ASDC model version for this resource  model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pnf-ipv4-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This is the IP address (IPv4) for the PNF itself. This is the IPv4 address that the PNF iself can be accessed at.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pnf-ipv6-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This is the IP address (IPv6) for the PNF itself. This is the IPv6 address that the PNF iself can be accessed at.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:software-versions" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:p-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:vrfs" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pnfs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:pnf" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="physical-link">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id",uriTemplate="/network/physical-links/physical-link/{link-name}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="link-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="circuit-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Circuit it")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dual-mode" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Dual access mode (e.g., primary, secondary")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-provider-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the service Provider on this link.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-provider-bandwidth-up-value" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Upstream Bandwidth value agreed with the service provider")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-provider-bandwidth-up-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Units for the upstream BW value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-provider-bandwidth-down-value" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Downstream Bandwidth value agreed with the service provider")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-provider-bandwidth-down-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Units for downstream BW value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="physical-links">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:physical-link" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vig-server">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers",uriTemplate="/vig-servers/vig-server/{vig-address-type}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vig-address-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="indicates whether the VIG is for AVPN or INTERNET")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-vig" type="xs:string" minOccurs="0" maxOccurs="5000">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="v4 IP of the vig server")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-vig" type="xs:string" minOccurs="0" maxOccurs="5000">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="v6 IP of the vig server")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vig-servers">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:vig-server" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ipsec-configuration">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network",uriTemplate="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="ipsec-configuration-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of this configuration")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="requested-vig-address-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicate the type of VIG server like AVPN, INTERNET, BOTH")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="requested-encryption-strength" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="requested-dmz-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ATT can offer a shared DMZ or a DMZ specific to a customer")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="shared-dmz-network-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Network address of shared DMZ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="requested-customer-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="If the DMZ is a custom DMZ, this field will indicate the customer information")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ike-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="can be 1 or 2")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-authentication" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Contains values like md5, sha1, sha256, sha384")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-encryption" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-dh-group" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-am-group-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group name defined in VIG for clients using aggressive mode")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-am-password" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="pre-shared key for the above group name ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-sa-lifetime" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Lifetime for IKEv1 SA")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipsec-authentication" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="md5, sha1, sha256, sha384")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipsec-encryption" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipsec-sa-lifetime" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Life time for IPSec SA")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipsec-pfs" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="enable PFS or not")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="xauth-userid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="user ID for xAuth, sm-user,ucpeHostName,nmteHostName")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="xauth-user-password" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Encrypted using the Juniper $9$ algorithm")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dpd-interval" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The time between DPD probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dpd-frequency" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Maximum number of DPD before claiming the tunnel is down")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:vig-servers" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ipsec-configurations">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:ipsec-configuration" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-table-reference">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network",uriTemplate="/network/route-table-references/route-table-reference/{route-table-reference-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="route-table-reference-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="route-table-reference-fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="FQDN entry in the route table.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-table-references">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack route table references")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:route-table-reference" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-group">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Instance Group ID, UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="instance-group-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="role of the instance group.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ASDC model version uid for this resource model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Descriptive text to help identify the usage of this instance-group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="instance-group-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="instance-group-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Instance-Group Name.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="instance-group-function" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Instance-Group Function")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-groups">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack route table references")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:instance-group" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="zone">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network",uriTemplate="/network/zones/zone/{zone-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="zone-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Code assigned by AIC to the zone")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="zone-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="English name associated with the zone")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="design-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Design of zone [Medium/Large…]")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="zone-context" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Context of zone [production/test]")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Status of a zone.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="zones">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of zones")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:zone" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vlan-mapping">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vlan-mapping object is an optional child object of the forwarder-evc object.  A given forwarder-evc object may have multiple vlan-mapping objects.",dependentOn="forwarder-evc",uniqueProps="vlan-mapping-id",container="vlan-mappings",uriTemplate="/vlan-mappings/vlan-mapping/{vlan-mapping-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vlan-mapping-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Key for vlan-mapping object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="uni-cvlan" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="CVLAN value from the UNI/ingress side of the SAREA gateway access device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nni-svlan" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="SVLAN value from the NNI/egress side of the SAREA gateway access device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nni-cvlan" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="CVLAN value from the NNI/egress side of the SAREA gateway access device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ivlan" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The internal VLAN ('IVLAN') value.  Specific to Arista devices.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vlan-mappings">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of vlan mappings.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vlan-mapping" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="forwarder-evc">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="forwarder object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="forwarder-evc-id",container="forwarder-evcs",uriTemplate="/forwarder-evcs/forwarder-evc/{forwarder-evc-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="forwarder-evc-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Key for forwarder-evc object")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="circuit-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Circuit ID from customer/ESP/ingress end of EVC, or reference to beater circuit on gateway/network/egress end of EVC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ivlan" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Internal VLAN.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="svlan" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="SVLAN value for ingress of egress forwarder.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cvlan" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="CVLAN value for ingress of egress forwarder.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:vlan-mappings" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="forwarder-evcs">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:forwarder-evc" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="evc">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="evc object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="evc-id",container="evcs",uriTemplate="/evcs/evc/{evc-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="evc-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique/key field for the evc object")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="forwarding-path-topology" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Point-to-Point, Multi-Point")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cir-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Commited Information Rate")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cir-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="CIR units")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="connection-diversity-group-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Diversity Group ID")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-hours" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="formerly Performance Group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="esp-evc-circuit-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="EVC Circuit ID of ESP EVC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="esp-evc-cir-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Committed Information Rate (For ESP)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="esp-evc-cir-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="CIR units (For ESP)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="esp-itu-code" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Identifies ESP")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="collector-pop-clli" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Collector POP CLLI (from the hostname of the access pnf)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="inter-connect-type-ingress" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Interconnect type on ingress side of EVC.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="tagmode-access-ingress" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="tagode for collector side of EVC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="tagmode-access-egress" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="tagMode for network side of EVC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="evcs">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:evc" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="configuration">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic configuration object.",indexedProps="configuration-id,model-invariant-id,model-version-id",uniqueProps="configuration-id",container="configurations",namespace="network",uriTemplate="/network/configurations/configuration/{configuration-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="configuration-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID assigned to configuration.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="configuration-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the configuration.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="configuration-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="port-mirroring-configuration.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="configuration-sub-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="vprobe, pprobe.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of the configuration.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="configuration-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details from SDN-GC.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="id of  the configuration used to customize the resource")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="tunnel-bandwidth" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="DHV Site Effective Bandwidth")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vendor-allowed-max-bandwidth" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Velocloud Nominal Throughput - VNT")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="config-policy-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used to capture the name of the fabric configuration policy that was used to generate the payload sent to PINC for fabric configuration.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-        <xs:element ref="tns:forwarder-evcs" minOccurs="0"/>
-        <xs:element ref="tns:evcs" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="configurations">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of configurations")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:configuration" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="forwarder">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="sequence",description="Entity describing a sequenced segment of forwarding path",container="forwarders",dependentOn="forwarding-path",uriTemplate="/forwarders/forwarder/{sequence}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="sequence" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of this segmentation")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="forwarder-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ingress, intermediate, egress")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="forwarders">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:forwarder" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="forwarding-path">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",indexedProps="forwarding-path-id,forwarding-path-name",description="Entity that describes the sequenced forwarding path between interfaces of services or resources",container="forwarding-paths",nameProps="forwarding-path-name",uniqueProps="forwarding-path-id",uriTemplate="/network/forwarding-paths/forwarding-path/{forwarding-path-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="forwarding-path-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of this FP")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="forwarding-path-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the FP")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the self link for this FP")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:forwarders" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="forwarding-paths">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:forwarding-path" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="collection">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",description="represents the collection resource in the TOSCA model",uniqueProps="collection-id",indexedProps="collection-id,model-invariant-id,model-version-id",container="collections",uriTemplate="/network/collections/collection/{collection-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="collection-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Collection Object UUID")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ASDC model id for this resource or service model",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Model Version",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="collection-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="collection name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="collection-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Collection type")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="collection-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Collection Role")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="collection-function" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Collection function")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="orchestration status")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="collection-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the id of all the configuration used to customize the resource for the service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="collections">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:collection" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vlan-tag">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",container="vlan-tags",uniqueProps="vlan-tag-id",uriTemplate="/network/vlan-tags/vlan-tag/{vlan-tag-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vlan-tag-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vlan-tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-tag-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="purpose (l3-network to be connected to)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-inner" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN inner id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN outer id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-private" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="is VLAN private?")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vlan-tags">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:vlan-tag" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="connectivity">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a connectivity",indexedProps="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",nameProps="etht-svc-name",searchable="connectivity-id",uniqueProps="connectivity-id",container="connectivities",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="connectivity-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this connectivity by id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-profile-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the name of a bandwidth profile.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the type of a bandwidth profile.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cir" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the CIR of this connectivity.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="eir" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the EIR of this connectivity.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cbs" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the CBS of this connectivity.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ebs" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the EBS of this connectivity.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="color-aware" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the color-awareness of this connectivity.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="coupling-flag" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the coupling flag of this connectivity.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="etht-svc-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The ethernet service name for this connectivity.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="access-provider-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access provider of this connectivity.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="access-client-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access client of this connectivity.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="access-topology-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access topology of this connectivity.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="access-node-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access node of this connectivity.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="access-ltp-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access ltp of this connectivity.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="connectivity-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the link to get more information for this connectivity.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cvlan" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the cvlan for this connectivity.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="connectivities">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of connectivities")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:connectivity" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="dhcp-service">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a dhcp-service",indexedProps="dhcp-service-id,dhcp-service-type,domain-name,server-ipv4-address,server-ipv6-address",nameProps="domain-name",searchable="dhcp-service-id",uniqueProps="dhcp-service-id",container="dhcp-services",dependentOn="lan-port-config",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="dhcp-service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this dhcp-service by id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="server-ipv4-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the server-ip4-address of this dhcp-service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="server-ipv6-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the server-ipv6-address of this dhcp-service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-enable" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the service-enable of this dhcp-service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dhcp-service-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the dhcp-service-type of this dhcp-service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="lease-time" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the lease-time of this dhcp-service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="domain-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the domain-name of this dhcp-service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dns" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the dns of this dhcp-service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ntp-primary" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ntp-primary of this dhcp-service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ntp-secondary" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ntp-secondary of this dhcp-service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nbns" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the nbns of this dhcp-service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="dhcp-services">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of dhcp-services")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:dhcp-service" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lan-port-config">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a lan-port-config",indexedProps="lan-port-config-id,lan-port-config-name,device-id,port-id,ipv4-address,ipv6-address,vlan-tag",nameProps="lan-port-config-name",searchable="lan-port-config-id",uniqueProps="lan-port-config-id",container="lan-port-configs",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="lan-port-config-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this lan-port-config by id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="lan-port-config-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the name of this lan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the description of this lan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="device-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the device-id of this lan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="port-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the port-id of this lan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ipv4-address of this lan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv6-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ipv6-address of this lan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-tag" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the vlan-tag of this lan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="input-bandwidth" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the input-bandwidth of this lan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="output-bandwidth" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the output-bandwidth of this lan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:dhcp-services" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lan-port-configs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of lan-port-configs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:lan-port-config" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-resource">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a network-resource",indexedProps="network-id,provider-id,client-id,te-topo-id",nameProps="network-id",searchable="network-id",uniqueProps="network-id",container="network-resources",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this network-resource by id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="provider-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the provider of this network-resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="client-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the client of this network-resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="te-topo-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the te-topo of this network-resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-resources">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of network-resources")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:network-resource" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-resource">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a site-resource",indexedProps="site-resource-id,site-resource-name,type,role,generated-site-id,operational-status",nameProps="site-resource-name",searchable="site-resource-id",uniqueProps="site-resource-id",container="site-resources",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="site-resource-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this site-resource by id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="site-resource-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the name of this site-resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the description of this site-resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the type of this site-resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the role of this site-resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="generated-site-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the generated-site-id of this site-resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-resources">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of site-resources")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:site-resource" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sdwan-vpn">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an sdwan-vpn",indexedProps="sdwan-vpn-id,sdwan-vpn-name,vxlan-id,topology,operational-status",nameProps="sdwan-vpn-name",searchable="sdwan-vpn-id",uniqueProps="sdwan-vpn-id",container="sdwan-vpns",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="sdwan-vpn-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this sdwan-vpn by id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="sdwan-vpn-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the name of this sdwan-vpn.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vxlan-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the vxlan-id of this sdwan-vpn.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="topology" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the topology of this sdwan-vpn.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="tenant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the tenant-id of this sdwan-vpn.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the vpn-id of this sdwan-vpn.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sdwan-vpns">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of sdwan-vpns")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:sdwan-vpn" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="device">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a device",indexedProps="device-id,device-name,esn,vendor,class,type,version,system-ip,system-ipv4,system-ipv6,operational-status",nameProps="device-name",searchable="device-id",uniqueProps="device-id",container="devices",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="device-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this device by id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="esn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the esn of this device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="device-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the name of this device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the description of this device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the vendor of this device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="class" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the class of this device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the type of this device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the version of this device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="system-ip" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the system-ip of this device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="system-ipv4" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the system-ipv4 of this device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="system-ipv6" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the system-ipv6 of this device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="devices">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of devices")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:device" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="wan-port-config">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a wan-port-config",indexedProps="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",nameProps="wan-port-config-name",searchable="wan-port-config-id",uniqueProps="wan-port-config-id",container="wan-port-configs",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="wan-port-config-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this wan-port-config by id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="wan-port-config-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the name of this wan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="device-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the device of this wan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the vlan of this wan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ip-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ip-address of this wan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ipv4-address of this wan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv6-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ipv6-address of this wan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="provider-ip-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the provider-ip-address of this wan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="provider-ipv4-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the provider-ipv4-address of this wan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="provider-ipv6-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the provider-ipv6-address of this wan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="input-bandwidth" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the input-bandwidth of this wan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="output-bandwidth" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the output-bandwidth of this wan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the description of this wan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="port-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the port-type of this wan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="port-number" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the port-number of this wan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="transport-network-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the transport-network-name of this wan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="device-port-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the device-port-id of this wan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="wan-port-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the wan-port-id of this wan-port-config.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="wan-port-configs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of wan-port-configs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:wan-port-config" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ext-aai-network">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Refer to an external AAI in another ONAP.",indexedProps="aai-id",searchable="aai-id",container="ext-aai-networks",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="aai-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the referenced AAI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="schema-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Schema version of the referenced AAI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:esr-system-info" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ext-aai-networks">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:ext-aai-network" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for network inventory resources.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:logical-links" minOccurs="0"/>
-        <xs:element ref="tns:site-pair-sets" minOccurs="0"/>
-        <xs:element ref="tns:vpn-bindings" minOccurs="0"/>
-        <xs:element ref="tns:vpls-pes" minOccurs="0"/>
-        <xs:element ref="tns:multicast-configurations" minOccurs="0"/>
-        <xs:element ref="tns:vces" minOccurs="0"/>
-        <xs:element ref="tns:vnfcs" minOccurs="0"/>
-        <xs:element ref="tns:l3-networks" minOccurs="0"/>
-        <xs:element ref="tns:network-policies" minOccurs="0"/>
-        <xs:element ref="tns:generic-vnfs" minOccurs="0"/>
-        <xs:element ref="tns:lag-links" minOccurs="0"/>
-        <xs:element ref="tns:newvces" minOccurs="0"/>
-        <xs:element ref="tns:pnfs" minOccurs="0"/>
-        <xs:element ref="tns:physical-links" minOccurs="0"/>
-        <xs:element ref="tns:ipsec-configurations" minOccurs="0"/>
-        <xs:element ref="tns:route-table-references" minOccurs="0"/>
-        <xs:element ref="tns:instance-groups" minOccurs="0"/>
-        <xs:element ref="tns:zones" minOccurs="0"/>
-        <xs:element ref="tns:configurations" minOccurs="0"/>
-        <xs:element ref="tns:forwarding-paths" minOccurs="0"/>
-        <xs:element ref="tns:collections" minOccurs="0"/>
-        <xs:element ref="tns:vlan-tags" minOccurs="0"/>
-        <xs:element ref="tns:connectivities" minOccurs="0"/>
-        <xs:element ref="tns:lan-port-configs" minOccurs="0"/>
-        <xs:element ref="tns:network-resources" minOccurs="0"/>
-        <xs:element ref="tns:site-resources" minOccurs="0"/>
-        <xs:element ref="tns:sdwan-vpns" minOccurs="0"/>
-        <xs:element ref="tns:devices" minOccurs="0"/>
-        <xs:element ref="tns:wan-port-configs" minOccurs="0"/>
-        <xs:element ref="tns:ext-aai-networks" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="reserved-prop-names">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="last-mod-source-of-truth" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-node-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-created-ts" type="xs:unsignedInt" minOccurs="0"/>
-        <xs:element name="aai-unique-key" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-last-mod-ts" type="xs:unsignedInt" minOccurs="0"/>
-        <xs:element name="source-of-truth" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-uri" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="edge-prop-names">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV",uniqueProps="aai-uuid",indexedProps="aai-uuid")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="edgeLabel" type="xs:string" minOccurs="0"/>
-        <xs:element name="direction" type="xs:string" minOccurs="0"/>
-        <xs:element name="multiplicityRule" type="xs:string" minOccurs="0"/>
-        <xs:element name="contains-other-v" type="xs:string" minOccurs="0"/>
-        <xs:element name="delete-other-v" type="xs:string" minOccurs="0"/>
-        <xs:element name="SVC-INFRA" type="xs:string" minOccurs="0"/>
-        <xs:element name="prevent-delete" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-uuid" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="aai-internal">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:reserved-prop-names" minOccurs="0" maxOccurs="5000"/>
-        <xs:element ref="tns:edge-prop-names" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="contact">
-    <xs:complexType>
-      <xs:annotation>\r
-        <xs:appinfo>\r
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Contacts store the vendor information and have a relationship to the generic-vnf.  In 1902, this will be populated by SDN-GC",uniqueProps="contact-name",container="contacts",namespace="common",nameProps="contact-name,vendor-type",uriTemplate="/common/contacts/contact/{contact-name}")</annox:annotate>\r
-        </xs:appinfo>\r
-      </xs:annotation>\r
-      <xs:sequence>
-        <xs:element name="contact-name" type="xs:string" minOccurs="0">
+      <xs:sequence>\r
+        <xs:element name="contact-name" type="xs:string" minOccurs="0">\r
           <xs:annotation>\r
             <xs:appinfo>\r
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the contact")</annox:annotate>\r
             </xs:appinfo>\r
           </xs:annotation>\r
-        </xs:element>
-        <xs:element name="contact-telephone" type="xs:string" minOccurs="0">
+        </xs:element>\r
+        <xs:element name="contact-telephone" type="xs:string" minOccurs="0">\r
           <xs:annotation>\r
             <xs:appinfo>\r
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Tel no. of contact")</annox:annotate>\r
             </xs:appinfo>\r
           </xs:annotation>\r
-        </xs:element>
-        <xs:element name="contact-email" type="xs:string" minOccurs="0">
+        </xs:element>\r
+        <xs:element name="contact-email" type="xs:string" minOccurs="0">\r
           <xs:annotation>\r
             <xs:appinfo>\r
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="e-mail of contact")</annox:annotate>\r
             </xs:appinfo>\r
           </xs:annotation>\r
-        </xs:element>
-        <xs:element name="vendor-type" type="xs:string" minOccurs="0">
+        </xs:element>\r
+        <xs:element name="vendor-type" type="xs:string" minOccurs="0">\r
           <xs:annotation>\r
             <xs:appinfo>\r
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="NI (Network Integrator)SI (System Integrator) 3rd Party LCM")</annox:annotate>\r
             </xs:appinfo>\r
           </xs:annotation>\r
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
           <xs:annotation>\r
             <xs:appinfo>\r
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
             </xs:appinfo>\r
           </xs:annotation>\r
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="contacts">
-    <xs:complexType>
+        </xs:element>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="contacts">\r
+    <xs:complexType>\r
       <xs:annotation>\r
         <xs:appinfo>\r
           <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of contacts")</annox:annotate>\r
         </xs:appinfo>\r
       </xs:annotation>\r
-      <xs:sequence>
-        <xs:element ref="tns:contact" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="common">
-    <xs:complexType>
+      <xs:sequence>\r
+        <xs:element ref="tns:contact" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="common">\r
+    <xs:complexType>\r
       <xs:annotation>\r
         <xs:appinfo>\r
           <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for common inventory resources.")</annox:annotate>\r
         </xs:appinfo>\r
       </xs:annotation>\r
-      <xs:sequence>
-        <xs:element ref="tns:contacts" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="notification-event-header">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string" minOccurs="0"/>
-        <xs:element name="timestamp" type="xs:string" minOccurs="0"/>
-        <xs:element name="source-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="domain" type="xs:string" minOccurs="0"/>
-        <xs:element name="sequence-number" type="xs:string" minOccurs="0"/>
-        <xs:element name="severity" type="xs:string" minOccurs="0"/>
-        <xs:element name="event-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="version" type="xs:string" minOccurs="0"/>
-        <xs:element name="action" type="xs:string" minOccurs="0"/>
-        <xs:element name="entity-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="top-entity-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="entity-link" type="xs:string" minOccurs="0"/>
-        <xs:element name="status" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="notification-event">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="cambria.partition" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:notification-event-header" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="overloaded-model">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-name-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Description")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-vers" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="query-parameters">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="QueryParameters for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:named-query" minOccurs="0"/>
-        <xs:element ref="tns:overloaded-model" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-filter">
-    <xs:complexType>
-      <xs:sequence/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-filters">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="InstanceFilters for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:instance-filter" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="secondary-filt">
-    <xs:complexType>
-      <xs:sequence/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="secondary-filts">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SecondaryFilts for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:secondary-filt" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-and-named-query-search">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:query-parameters" minOccurs="0"/>
-        <xs:element ref="tns:instance-filters" minOccurs="0"/>
-        <xs:element ref="tns:secondary-filts" minOccurs="0"/>
-        <xs:element name="top-node-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="secondary-filter-cut-point" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="properties">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Property holder for query properties or instance properties")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="extra-property">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="extra-properties">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Extra properties for inventory item for response list")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:extra-property" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory-response-item">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Inventory item for response list",container="inventory-response-items")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-name" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:extra-properties" minOccurs="0"/>
-        <xs:element ref="tns:inventory-response-items" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory-response-items">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Container for inventory items in response list",container="response-list")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:inventory-response-item" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="response-list">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Response container for the results of a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:inventory-response-items" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:search" minOccurs="0"/>
-        <xs:element ref="tns:actions" minOccurs="0"/>
-        <xs:element ref="tns:cloud-infrastructure" minOccurs="0"/>
-        <xs:element ref="tns:external-system" minOccurs="0"/>
-        <xs:element ref="tns:business" minOccurs="0"/>
-        <xs:element ref="tns:service-design-and-creation" minOccurs="0"/>
-        <xs:element ref="tns:network" minOccurs="0"/>
-        <xs:element ref="tns:aai-internal" minOccurs="0"/>
-        <xs:element ref="tns:common" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
+      <xs:sequence>\r
+        <xs:element ref="tns:contacts" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="notification-event-header">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element name="id" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="timestamp" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="source-name" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="domain" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="sequence-number" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="severity" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="event-type" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="version" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="action" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="entity-type" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="top-entity-type" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="entity-link" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="status" type="xs:string" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="notification-event">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element name="cambria.partition" type="xs:string" minOccurs="0"/>\r
+        <xs:element ref="tns:notification-event-header" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="overloaded-model">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models",requiredProps="model-invariant-id,model-name-version-id,model-type,model-name,model-id,model-version")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-name-version-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-type" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-name" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="model-description" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Description")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+        <xs:element ref="tns:model-vers" minOccurs="0"/>\r
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="query-parameters">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="QueryParameters for performing a named-query or model query")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:named-query" minOccurs="0"/>\r
+        <xs:element ref="tns:overloaded-model" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="instance-filter">\r
+    <xs:complexType>\r
+      <xs:sequence/>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="instance-filters">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="InstanceFilters for performing a named-query or model query")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:instance-filter" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="secondary-filt">\r
+    <xs:complexType>\r
+      <xs:sequence/>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="secondary-filts">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SecondaryFilts for performing a named-query or model query")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:secondary-filt" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="model-and-named-query-search">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:query-parameters" minOccurs="0"/>\r
+        <xs:element ref="tns:instance-filters" minOccurs="0"/>\r
+        <xs:element ref="tns:secondary-filts" minOccurs="0"/>\r
+        <xs:element name="top-node-type" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="secondary-filter-cut-point" type="xs:string" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="properties">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Property holder for query properties or instance properties")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="property-name" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="property-value" type="xs:string" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="extra-property">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element name="property-name" type="xs:string" minOccurs="0"/>\r
+        <xs:element name="property-value" type="xs:string" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="extra-properties">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Extra properties for inventory item for response list")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:extra-property" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="inventory-response-item">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Inventory item for response list",container="inventory-response-items")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="model-name" type="xs:string" minOccurs="0"/>\r
+        <xs:element ref="tns:extra-properties" minOccurs="0"/>\r
+        <xs:element ref="tns:inventory-response-items" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="inventory-response-items">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Container for inventory items in response list",container="response-list")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:inventory-response-item" minOccurs="0" maxOccurs="5000"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="response-list">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Response container for the results of a named-query or model query")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:inventory-response-items" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="vnf">\r
+    <xs:complexType>\r
+      <xs:annotation>\r
+        <xs:appinfo>\r
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true",requiredProps="vnf-id")</annox:annotate>\r
+        </xs:appinfo>\r
+      </xs:annotation>\r
+      <xs:sequence>\r
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">\r
+          <xs:annotation>\r
+            <xs:appinfo>\r
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>\r
+            </xs:appinfo>\r
+          </xs:annotation>\r
+        </xs:element>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="inventory">\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element ref="tns:search" minOccurs="0"/>\r
+        <xs:element ref="tns:actions" minOccurs="0"/>\r
+        <xs:element ref="tns:cloud-infrastructure" minOccurs="0"/>\r
+        <xs:element ref="tns:external-system" minOccurs="0"/>\r
+        <xs:element ref="tns:business" minOccurs="0"/>\r
+        <xs:element ref="tns:service-design-and-creation" minOccurs="0"/>\r
+        <xs:element ref="tns:network" minOccurs="0"/>\r
+        <xs:element ref="tns:aai-internal" minOccurs="0"/>\r
+        <xs:element ref="tns:common" minOccurs="0"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
+</xs:schema>\r

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v8.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v8.xsd
index 0aa9d37..7365190 100644 (file)
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v8.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v8.xsd
@@ -87,8 +87,8 @@
   <xs:element name="relationship-data">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="relationship-key" type="xs:string"/>
-        <xs:element name="relationship-value" type="xs:string"/>
+        <xs:element name="relationship-key" type="xs:string" minOccurs="0"/>
+        <xs:element name="relationship-value" type="xs:string" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -120,9 +120,9 @@
   <xs:element name="oam-network">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="network-uuid" type="xs:string"/>
-        <xs:element name="network-name" type="xs:string"/>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt"/>
+        <xs:element name="network-uuid" type="xs:string" minOccurs="0"/>
+        <xs:element name="network-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="cvlan-tag" type="xs:unsignedInt" minOccurs="0"/>
         <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0"/>
         <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
@@ -140,8 +140,8 @@
   <xs:element name="dvs-switch">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="switch-name" type="xs:string"/>
-        <xs:element name="vcenter-url" type="xs:string"/>
+        <xs:element name="switch-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="vcenter-url" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
       </xs:sequence>
@@ -157,8 +157,8 @@
   <xs:element name="availability-zone">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="availability-zone-name" type="xs:string"/>
-        <xs:element name="hypervisor-type" type="xs:string"/>
+        <xs:element name="availability-zone-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="hypervisor-type" type="xs:string" minOccurs="0"/>
         <xs:element name="operational-state" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -218,7 +218,7 @@
   <xs:element name="update">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="update-node-type" type="xs:string"/>
+        <xs:element name="update-node-type" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:update-node-key" minOccurs="0" maxOccurs="5000"/>
         <xs:element name="update-node-uri" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:action" minOccurs="0" maxOccurs="5000"/>
@@ -236,7 +236,7 @@
   <xs:element name="notify">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="event-id" type="xs:string"/>
+        <xs:element name="event-id" type="xs:string" minOccurs="0"/>
         <xs:element name="node-type" type="xs:string" minOccurs="0"/>
         <xs:element name="event-trigger" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:key-data" minOccurs="0" maxOccurs="5000"/>
@@ -255,9 +255,9 @@
   <xs:element name="ctag-pool">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="target-pe" type="xs:string"/>
-        <xs:element name="availability-zone-name" type="xs:string"/>
-        <xs:element name="ctag-pool-purpose" type="xs:string"/>
+        <xs:element name="target-pe" type="xs:string" minOccurs="0"/>
+        <xs:element name="availability-zone-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="ctag-pool-purpose" type="xs:string" minOccurs="0"/>
         <xs:element name="ctag-values" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -274,19 +274,19 @@
   <xs:element name="complex">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="physical-location-id" type="xs:string"/>
+        <xs:element name="physical-location-id" type="xs:string" minOccurs="0"/>
         <xs:element name="data-center-code" type="xs:string" minOccurs="0"/>
         <xs:element name="complex-name" type="xs:string" minOccurs="0"/>
         <xs:element name="identity-url" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element name="physical-location-type" type="xs:string"/>
-        <xs:element name="street1" type="xs:string"/>
+        <xs:element name="physical-location-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="street1" type="xs:string" minOccurs="0"/>
         <xs:element name="street2" type="xs:string" minOccurs="0"/>
-        <xs:element name="city" type="xs:string"/>
+        <xs:element name="city" type="xs:string" minOccurs="0"/>
         <xs:element name="state" type="xs:string" minOccurs="0"/>
-        <xs:element name="postal-code" type="xs:string"/>
-        <xs:element name="country" type="xs:string"/>
-        <xs:element name="region" type="xs:string"/>
+        <xs:element name="postal-code" type="xs:string" minOccurs="0"/>
+        <xs:element name="country" type="xs:string" minOccurs="0"/>
+        <xs:element name="region" type="xs:string" minOccurs="0"/>
         <xs:element name="latitude" type="xs:string" minOccurs="0"/>
         <xs:element name="longitude" type="xs:string" minOccurs="0"/>
         <xs:element name="elevation" type="xs:string" minOccurs="0"/>
@@ -306,10 +306,10 @@
   <xs:element name="volume-group">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="volume-group-id" type="xs:string"/>
-        <xs:element name="volume-group-name" type="xs:string"/>
+        <xs:element name="volume-group-id" type="xs:string" minOccurs="0"/>
+        <xs:element name="volume-group-name" type="xs:string" minOccurs="0"/>
         <xs:element name="heat-stack-id" type="xs:string" minOccurs="0"/>
-        <xs:element name="vnf-type" type="xs:string"/>
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0"/>
         <xs:element name="orchestration-status" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -326,8 +326,8 @@
   <xs:element name="volume">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="volume-id" type="xs:string"/>
-        <xs:element name="volume-selflink" type="xs:string"/>
+        <xs:element name="volume-id" type="xs:string" minOccurs="0"/>
+        <xs:element name="volume-selflink" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
       </xs:sequence>
@@ -343,7 +343,7 @@
   <xs:element name="l3-interface-ipv4-address-list">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="l3-interface-ipv4-address" type="xs:string"/>
+        <xs:element name="l3-interface-ipv4-address" type="xs:string" minOccurs="0"/>
         <xs:element name="l3-interface-ipv4-prefix-length" type="xs:unsignedInt" minOccurs="0"/>
         <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0"/>
         <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0"/>
@@ -358,7 +358,7 @@
   <xs:element name="l3-interface-ipv6-address-list">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="l3-interface-ipv6-address" type="xs:string"/>
+        <xs:element name="l3-interface-ipv6-address" type="xs:string" minOccurs="0"/>
         <xs:element name="l3-interface-ipv6-prefix-length" type="xs:unsignedInt" minOccurs="0"/>
         <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0"/>
         <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0"/>
@@ -373,7 +373,7 @@
   <xs:element name="vlan">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="vlan-interface" type="xs:string"/>
+        <xs:element name="vlan-interface" type="xs:string" minOccurs="0"/>
         <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0"/>
         <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
@@ -398,7 +398,7 @@
   <xs:element name="sriov-vf">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="pci-id" type="xs:string"/>
+        <xs:element name="pci-id" type="xs:string" minOccurs="0"/>
         <xs:element name="vf-vlan-filter" type="xs:string" minOccurs="0"/>
         <xs:element name="vf-mac-filter" type="xs:string" minOccurs="0"/>
         <xs:element name="vf-vlan-strip" type="xs:boolean" minOccurs="0"/>
@@ -426,7 +426,7 @@
   <xs:element name="l-interface">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="interface-name" type="xs:string"/>
+        <xs:element name="interface-name" type="xs:string" minOccurs="0"/>
         <xs:element name="interface-role" type="xs:string" minOccurs="0"/>
         <xs:element name="v6-wan-link-ip" type="xs:string" minOccurs="0"/>
         <xs:element name="selflink" type="xs:string" minOccurs="0"/>
@@ -453,11 +453,11 @@
   <xs:element name="vserver">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="vserver-id" type="xs:string"/>
-        <xs:element name="vserver-name" type="xs:string"/>
+        <xs:element name="vserver-id" type="xs:string" minOccurs="0"/>
+        <xs:element name="vserver-name" type="xs:string" minOccurs="0"/>
         <xs:element name="vserver-name2" type="xs:string" minOccurs="0"/>
         <xs:element name="prov-status" type="xs:string" minOccurs="0"/>
-        <xs:element name="vserver-selflink" type="xs:string"/>
+        <xs:element name="vserver-selflink" type="xs:string" minOccurs="0"/>
         <xs:element name="in-maint" type="xs:boolean" minOccurs="0"/>
         <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
@@ -477,8 +477,8 @@
   <xs:element name="tenant">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="tenant-id" type="xs:string"/>
-        <xs:element name="tenant-name" type="xs:string"/>
+        <xs:element name="tenant-id" type="xs:string" minOccurs="0"/>
+        <xs:element name="tenant-name" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:vservers" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -495,15 +495,15 @@
   <xs:element name="flavor">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="flavor-id" type="xs:string"/>
-        <xs:element name="flavor-name" type="xs:string"/>
+        <xs:element name="flavor-id" type="xs:string" minOccurs="0"/>
+        <xs:element name="flavor-name" type="xs:string" minOccurs="0"/>
         <xs:element name="flavor-vcpus" type="xs:int" minOccurs="0"/>
         <xs:element name="flavor-ram" type="xs:int" minOccurs="0"/>
         <xs:element name="flavor-disk" type="xs:int" minOccurs="0"/>
         <xs:element name="flavor-ephemeral" type="xs:int" minOccurs="0"/>
         <xs:element name="flavor-swap" type="xs:string" minOccurs="0"/>
         <xs:element name="flavor-is-public" type="xs:boolean" minOccurs="0"/>
-        <xs:element name="flavor-selflink" type="xs:string"/>
+        <xs:element name="flavor-selflink" type="xs:string" minOccurs="0"/>
         <xs:element name="flavor-disabled" type="xs:boolean" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -520,9 +520,9 @@
   <xs:element name="group-assignment">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="group-id" type="xs:string"/>
-        <xs:element name="group-type" type="xs:string"/>
-        <xs:element name="group-name" type="xs:string"/>
+        <xs:element name="group-id" type="xs:string" minOccurs="0"/>
+        <xs:element name="group-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="group-name" type="xs:string" minOccurs="0"/>
         <xs:element name="group-description" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -539,7 +539,7 @@
   <xs:element name="snapshot">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="snapshot-id" type="xs:string"/>
+        <xs:element name="snapshot-id" type="xs:string" minOccurs="0"/>
         <xs:element name="snapshot-name" type="xs:string" minOccurs="0"/>
         <xs:element name="snapshot-architecture" type="xs:string" minOccurs="0"/>
         <xs:element name="snapshot-os-distro" type="xs:string" minOccurs="0"/>
@@ -564,8 +564,8 @@
   <xs:element name="metadatum">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="metaname" type="xs:string"/>
-        <xs:element name="metaval" type="xs:string"/>
+        <xs:element name="metaname" type="xs:string" minOccurs="0"/>
+        <xs:element name="metaval" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
@@ -580,15 +580,15 @@
   <xs:element name="image">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="image-id" type="xs:string"/>
-        <xs:element name="image-name" type="xs:string"/>
+        <xs:element name="image-id" type="xs:string" minOccurs="0"/>
+        <xs:element name="image-name" type="xs:string" minOccurs="0"/>
         <xs:element name="image-architecture" type="xs:string" minOccurs="0"/>
-        <xs:element name="image-os-distro" type="xs:string"/>
-        <xs:element name="image-os-version" type="xs:string"/>
+        <xs:element name="image-os-distro" type="xs:string" minOccurs="0"/>
+        <xs:element name="image-os-version" type="xs:string" minOccurs="0"/>
         <xs:element name="application" type="xs:string" minOccurs="0"/>
         <xs:element name="application-vendor" type="xs:string" minOccurs="0"/>
         <xs:element name="application-version" type="xs:string" minOccurs="0"/>
-        <xs:element name="image-selflink" type="xs:string"/>
+        <xs:element name="image-selflink" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
         <xs:element ref="tns:metadata" minOccurs="0"/>
@@ -612,8 +612,8 @@
   <xs:element name="cloud-region">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="cloud-owner" type="xs:string"/>
-        <xs:element name="cloud-region-id" type="xs:string"/>
+        <xs:element name="cloud-owner" type="xs:string" minOccurs="0"/>
+        <xs:element name="cloud-region-id" type="xs:string" minOccurs="0"/>
         <xs:element name="cloud-type" type="xs:string" minOccurs="0"/>
         <xs:element name="owner-defined-type" type="xs:string" minOccurs="0"/>
         <xs:element name="cloud-region-version" type="xs:string" minOccurs="0"/>
@@ -644,7 +644,7 @@
   <xs:element name="network-profile">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="nm-profile-name" type="xs:string"/>
+        <xs:element name="nm-profile-name" type="xs:string" minOccurs="0"/>
         <xs:element name="community-string" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -661,7 +661,7 @@
   <xs:element name="p-interface">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="interface-name" type="xs:string"/>
+        <xs:element name="interface-name" type="xs:string" minOccurs="0"/>
         <xs:element name="speed-value" type="xs:string" minOccurs="0"/>
         <xs:element name="speed-units" type="xs:string" minOccurs="0"/>
         <xs:element name="port-description" type="xs:string" minOccurs="0"/>
@@ -684,7 +684,7 @@
   <xs:element name="lag-interface">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="interface-name" type="xs:string"/>
+        <xs:element name="interface-name" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element name="speed-value" type="xs:string" minOccurs="0"/>
         <xs:element name="speed-units" type="xs:string" minOccurs="0"/>
@@ -703,7 +703,7 @@
   <xs:element name="pserver">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="hostname" type="xs:string"/>
+        <xs:element name="hostname" type="xs:string" minOccurs="0"/>
         <xs:element name="ptnii-equip-name" type="xs:string" minOccurs="0"/>
         <xs:element name="number-of-cpus" type="xs:int" minOccurs="0"/>
         <xs:element name="disk-in-gigabytes" type="xs:int" minOccurs="0"/>
@@ -737,8 +737,8 @@
   <xs:element name="virtual-data-center">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="vdc-id" type="xs:string"/>
-        <xs:element name="vdc-name" type="xs:string"/>
+        <xs:element name="vdc-id" type="xs:string" minOccurs="0"/>
+        <xs:element name="vdc-name" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
       </xs:sequence>
@@ -765,7 +765,7 @@
   <xs:element name="connector">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="resource-instance-id" type="xs:string"/>
+        <xs:element name="resource-instance-id" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element name="persona-model-id" type="xs:string" minOccurs="0"/>
         <xs:element name="persona-model-version" type="xs:string" minOccurs="0"/>
@@ -787,7 +787,7 @@
   <xs:element name="service-instance">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="service-instance-id" type="xs:string"/>
+        <xs:element name="service-instance-id" type="xs:string" minOccurs="0"/>
         <xs:element name="service-instance-name" type="xs:string" minOccurs="0"/>
         <xs:element name="persona-model-id" type="xs:string" minOccurs="0"/>
         <xs:element name="persona-model-version" type="xs:string" minOccurs="0"/>
@@ -817,7 +817,7 @@
   <xs:element name="service-subscription">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="service-type" type="xs:string"/>
+        <xs:element name="service-type" type="xs:string" minOccurs="0"/>
         <xs:element name="temp-ub-sub-account-id" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:service-instances" minOccurs="0"/>
@@ -835,9 +835,9 @@
   <xs:element name="customer">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="global-customer-id" type="xs:string"/>
-        <xs:element name="subscriber-name" type="xs:string"/>
-        <xs:element name="subscriber-type" type="xs:string"/>
+        <xs:element name="global-customer-id" type="xs:string" minOccurs="0"/>
+        <xs:element name="subscriber-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="subscriber-type" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:service-subscriptions" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -862,9 +862,9 @@
   <xs:element name="vnf-image">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="vnf-image-uuid" type="xs:string"/>
-        <xs:element name="application" type="xs:string"/>
-        <xs:element name="application-vendor" type="xs:string"/>
+        <xs:element name="vnf-image-uuid" type="xs:string" minOccurs="0"/>
+        <xs:element name="application" type="xs:string" minOccurs="0"/>
+        <xs:element name="application-vendor" type="xs:string" minOccurs="0"/>
         <xs:element name="application-version" type="xs:string" minOccurs="0"/>
         <xs:element name="selflink" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
@@ -882,8 +882,8 @@
   <xs:element name="service">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="service-id" type="xs:string"/>
-        <xs:element name="service-description" type="xs:string"/>
+        <xs:element name="service-id" type="xs:string" minOccurs="0"/>
+        <xs:element name="service-description" type="xs:string" minOccurs="0"/>
         <xs:element name="service-selflink" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element name="service-version" type="xs:string" minOccurs="0"/>
@@ -901,8 +901,8 @@
   <xs:element name="service-capability">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="service-type" type="xs:string"/>
-        <xs:element name="vnf-type" type="xs:string"/>
+        <xs:element name="service-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
       </xs:sequence>
@@ -918,8 +918,8 @@
   <xs:element name="element-choice-set">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="element-choice-set-uuid" type="xs:string"/>
-        <xs:element name="element-choice-set-name" type="xs:string"/>
+        <xs:element name="element-choice-set-uuid" type="xs:string" minOccurs="0"/>
+        <xs:element name="element-choice-set-name" type="xs:string" minOccurs="0"/>
         <xs:element name="cardinality" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:model-elements" minOccurs="0"/>
@@ -937,9 +937,9 @@
   <xs:element name="constrained-element-set">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="constrained-element-set-uuid" type="xs:string"/>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="check-type" type="xs:string"/>
+        <xs:element name="constrained-element-set-uuid" type="xs:string" minOccurs="0"/>
+        <xs:element name="constraint-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="check-type" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:element-choice-sets" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -956,8 +956,8 @@
   <xs:element name="model-constraint">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="model-constraint-uuid" type="xs:string"/>
-        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string"/>
+        <xs:element name="model-constraint-uuid" type="xs:string" minOccurs="0"/>
+        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:constrained-element-sets" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
@@ -972,9 +972,9 @@
   <xs:element name="model-element">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="model-element-uuid" type="xs:string"/>
-        <xs:element name="new-data-del-flag" type="xs:string"/>
-        <xs:element name="cardinality" type="xs:string"/>
+        <xs:element name="model-element-uuid" type="xs:string" minOccurs="0"/>
+        <xs:element name="new-data-del-flag" type="xs:string" minOccurs="0"/>
+        <xs:element name="cardinality" type="xs:string" minOccurs="0"/>
         <xs:element name="linkage-points" type="xs:string" minOccurs="0" maxOccurs="5000"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:model-elements" minOccurs="0"/>
@@ -993,11 +993,11 @@
   <xs:element name="model">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="model-name-version-id" type="xs:string"/>
-        <xs:element name="model-type" type="xs:string"/>
-        <xs:element name="model-name" type="xs:string"/>
-        <xs:element name="model-id" type="xs:string"/>
-        <xs:element name="model-version" type="xs:string"/>
+        <xs:element name="model-name-version-id" type="xs:string" minOccurs="0"/>
+        <xs:element name="model-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="model-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="model-id" type="xs:string" minOccurs="0"/>
+        <xs:element name="model-version" type="xs:string" minOccurs="0"/>
         <xs:element name="model-description" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:model-elements" minOccurs="0"/>
@@ -1016,11 +1016,11 @@
   <xs:element name="related-lookup">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="related-lookup-uuid" type="xs:string"/>
-        <xs:element name="source-node-type" type="xs:string"/>
-        <xs:element name="source-node-property" type="xs:string"/>
-        <xs:element name="target-node-type" type="xs:string"/>
-        <xs:element name="target-node-property" type="xs:string"/>
+        <xs:element name="related-lookup-uuid" type="xs:string" minOccurs="0"/>
+        <xs:element name="source-node-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="source-node-property" type="xs:string" minOccurs="0"/>
+        <xs:element name="target-node-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="target-node-property" type="xs:string" minOccurs="0"/>
         <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="5000"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -1037,10 +1037,10 @@
   <xs:element name="property-constraint">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="property-constraint-uuid" type="xs:string"/>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="property-name" type="xs:string"/>
-        <xs:element name="property-value" type="xs:string"/>
+        <xs:element name="property-constraint-uuid" type="xs:string" minOccurs="0"/>
+        <xs:element name="constraint-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
@@ -1055,7 +1055,7 @@
   <xs:element name="named-query-element">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="named-query-element-uuid" type="xs:string"/>
+        <xs:element name="named-query-element-uuid" type="xs:string" minOccurs="0"/>
         <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="5000"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element name="property-limit-desc" type="xs:string" minOccurs="0"/>
@@ -1077,9 +1077,9 @@
   <xs:element name="named-query">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="named-query-uuid" type="xs:string"/>
-        <xs:element name="named-query-name" type="xs:string"/>
-        <xs:element name="named-query-version" type="xs:string"/>
+        <xs:element name="named-query-uuid" type="xs:string" minOccurs="0"/>
+        <xs:element name="named-query-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="named-query-version" type="xs:string" minOccurs="0"/>
         <xs:element name="required-input-params" minOccurs="0">
           <xs:complexType>
             <xs:sequence>
@@ -1115,8 +1115,8 @@
   <xs:element name="logical-link">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="link-name" type="xs:string"/>
-        <xs:element name="link-type" type="xs:string"/>
+        <xs:element name="link-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="link-type" type="xs:string" minOccurs="0"/>
         <xs:element name="speed-value" type="xs:string" minOccurs="0"/>
         <xs:element name="speed-units" type="xs:string" minOccurs="0"/>
         <xs:element name="ip-version" type="xs:string" minOccurs="0"/>
@@ -1145,7 +1145,7 @@
   <xs:element name="class-of-service">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="cos" type="xs:string"/>
+        <xs:element name="cos" type="xs:string" minOccurs="0"/>
         <xs:element name="probe-id" type="xs:string" minOccurs="0"/>
         <xs:element name="probe-type" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
@@ -1163,7 +1163,7 @@
   <xs:element name="site-pair">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="site-pair-id" type="xs:string"/>
+        <xs:element name="site-pair-id" type="xs:string" minOccurs="0"/>
         <xs:element name="source-ip" type="xs:string" minOccurs="0"/>
         <xs:element name="destination-ip" type="xs:string" minOccurs="0"/>
         <xs:element name="ip-version" type="xs:string" minOccurs="0"/>
@@ -1185,7 +1185,7 @@
   <xs:element name="routing-instance">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="routing-instance-id" type="xs:string"/>
+        <xs:element name="routing-instance-id" type="xs:string" minOccurs="0"/>
         <xs:element name="rpm-owner" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:site-pairs" minOccurs="0"/>
@@ -1203,7 +1203,7 @@
   <xs:element name="site-pair-set">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="site-pair-set-id" type="xs:string"/>
+        <xs:element name="site-pair-set-id" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:routing-instances" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -1220,9 +1220,9 @@
   <xs:element name="vpn-binding">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="vpn-id" type="xs:string"/>
-        <xs:element name="vpn-name" type="xs:string"/>
-        <xs:element name="global-route-target" type="xs:string"/>
+        <xs:element name="vpn-id" type="xs:string" minOccurs="0"/>
+        <xs:element name="vpn-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="global-route-target" type="xs:string" minOccurs="0"/>
         <xs:element name="vpn-platform" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -1239,7 +1239,7 @@
   <xs:element name="vpls-pe">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="equipment-name" type="xs:string"/>
+        <xs:element name="equipment-name" type="xs:string" minOccurs="0"/>
         <xs:element name="prov-status" type="xs:string" minOccurs="0"/>
         <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0"/>
         <xs:element name="equipment-role" type="xs:string" minOccurs="0"/>
@@ -1261,9 +1261,9 @@
   <xs:element name="multicast-configuration">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="multicast-configuration-id" type="xs:string"/>
-        <xs:element name="multicast-protocol" type="xs:string"/>
-        <xs:element name="rp-type" type="xs:string"/>
+        <xs:element name="multicast-configuration-id" type="xs:string" minOccurs="0"/>
+        <xs:element name="multicast-protocol" type="xs:string" minOccurs="0"/>
+        <xs:element name="rp-type" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
       </xs:sequence>
@@ -1279,7 +1279,7 @@
   <xs:element name="cvlan-tag-entry">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt"/>
+        <xs:element name="cvlan-tag" type="xs:unsignedInt" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
       </xs:sequence>
@@ -1295,7 +1295,7 @@
   <xs:element name="port-group">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="interface-id" type="xs:string"/>
+        <xs:element name="interface-id" type="xs:string" minOccurs="0"/>
         <xs:element name="neutron-network-id" type="xs:string" minOccurs="0"/>
         <xs:element name="neutron-network-name" type="xs:string" minOccurs="0"/>
         <xs:element name="interface-role" type="xs:string" minOccurs="0"/>
@@ -1303,7 +1303,7 @@
         <xs:element name="port-group-id" type="xs:string" minOccurs="0"/>
         <xs:element name="port-group-name" type="xs:string" minOccurs="0"/>
         <xs:element name="switch-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="orchestration-status" type="xs:string"/>
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0"/>
         <xs:element name="heat-stack-id" type="xs:string" minOccurs="0"/>
         <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:cvlan-tags" minOccurs="0"/>
@@ -1321,10 +1321,10 @@
   <xs:element name="vce">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string"/>
-        <xs:element name="vnf-name" type="xs:string"/>
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0"/>
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0"/>
         <xs:element name="vnf-name2" type="xs:string" minOccurs="0"/>
-        <xs:element name="vnf-type" type="xs:string"/>
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0"/>
         <xs:element name="service-id" type="xs:string" minOccurs="0"/>
         <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0"/>
         <xs:element name="prov-status" type="xs:string" minOccurs="0"/>
@@ -1355,9 +1355,9 @@
   <xs:element name="vnfc">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="vnfc-name" type="xs:string"/>
-        <xs:element name="vnfc-function-code" type="xs:string"/>
-        <xs:element name="vnfc-type" type="xs:string"/>
+        <xs:element name="vnfc-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="vnfc-function-code" type="xs:string" minOccurs="0"/>
+        <xs:element name="vnfc-type" type="xs:string" minOccurs="0"/>
         <xs:element name="prov-status" type="xs:string" minOccurs="0"/>
         <xs:element name="orchestration-status" type="xs:string" minOccurs="0"/>
         <xs:element name="ipaddress-v4-oam-vip" type="xs:string" minOccurs="0"/>
@@ -1379,7 +1379,7 @@
   <xs:element name="subnet">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="subnet-id" type="xs:string"/>
+        <xs:element name="subnet-id" type="xs:string" minOccurs="0"/>
         <xs:element name="subnet-name" type="xs:string" minOccurs="0"/>
         <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0"/>
         <xs:element name="gateway-address" type="xs:string" minOccurs="0"/>
@@ -1405,7 +1405,7 @@
   <xs:element name="ctag-assignment">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt"/>
+        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
       </xs:sequence>
@@ -1421,7 +1421,7 @@
   <xs:element name="segmentation-assignment">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="segmentation-id" type="xs:string"/>
+        <xs:element name="segmentation-id" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
       </xs:sequence>
@@ -1437,8 +1437,8 @@
   <xs:element name="l3-network">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="network-id" type="xs:string"/>
-        <xs:element name="network-name" type="xs:string"/>
+        <xs:element name="network-id" type="xs:string" minOccurs="0"/>
+        <xs:element name="network-name" type="xs:string" minOccurs="0"/>
         <xs:element name="network-type" type="xs:string" minOccurs="0"/>
         <xs:element name="network-role" type="xs:string" minOccurs="0"/>
         <xs:element name="network-technology" type="xs:string" minOccurs="0"/>
@@ -1477,7 +1477,7 @@
   <xs:element name="network-policy">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="network-policy-id" type="xs:string"/>
+        <xs:element name="network-policy-id" type="xs:string" minOccurs="0"/>
         <xs:element name="network-policy-fqdn" type="xs:string" minOccurs="0"/>
         <xs:element name="heat-stack-id" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
@@ -1495,7 +1495,7 @@
   <xs:element name="vf-module">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="vf-module-id" type="xs:string"/>
+        <xs:element name="vf-module-id" type="xs:string" minOccurs="0"/>
         <xs:element name="vf-module-name" type="xs:string" minOccurs="0"/>
         <xs:element name="heat-stack-id" type="xs:string" minOccurs="0"/>
         <xs:element name="orchestration-status" type="xs:string" minOccurs="0"/>
@@ -1521,10 +1521,10 @@
   <xs:element name="generic-vnf">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string"/>
-        <xs:element name="vnf-name" type="xs:string"/>
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0"/>
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0"/>
         <xs:element name="vnf-name2" type="xs:string" minOccurs="0"/>
-        <xs:element name="vnf-type" type="xs:string"/>
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0"/>
         <xs:element name="service-id" type="xs:string" minOccurs="0"/>
         <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0"/>
         <xs:element name="prov-status" type="xs:string" minOccurs="0"/>
@@ -1574,7 +1574,7 @@
   <xs:element name="lag-link">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="link-name" type="xs:string"/>
+        <xs:element name="link-name" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
       </xs:sequence>
@@ -1590,10 +1590,10 @@
   <xs:element name="newvce">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="vnf-id2" type="xs:string"/>
-        <xs:element name="vnf-name" type="xs:string"/>
+        <xs:element name="vnf-id2" type="xs:string" minOccurs="0"/>
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0"/>
         <xs:element name="vnf-name2" type="xs:string" minOccurs="0"/>
-        <xs:element name="vnf-type" type="xs:string"/>
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0"/>
         <xs:element name="prov-status" type="xs:string" minOccurs="0"/>
         <xs:element name="operational-state" type="xs:string" minOccurs="0"/>
         <xs:element name="license-key" type="xs:string" minOccurs="0"/>
@@ -1619,7 +1619,7 @@
   <xs:element name="pnf">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="pnf-name" type="xs:string"/>
+        <xs:element name="pnf-name" type="xs:string" minOccurs="0"/>
         <xs:element name="pnf-name2" type="xs:string" minOccurs="0"/>
         <xs:element name="pnf-name2-source" type="xs:string" minOccurs="0"/>
         <xs:element name="pnf-id" type="xs:string" minOccurs="0"/>
@@ -1649,7 +1649,7 @@
   <xs:element name="physical-link">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="link-name" type="xs:string"/>
+        <xs:element name="link-name" type="xs:string" minOccurs="0"/>
         <xs:element name="speed-value" type="xs:string" minOccurs="0"/>
         <xs:element name="speed-units" type="xs:string" minOccurs="0"/>
         <xs:element name="circuit-id" type="xs:string" minOccurs="0"/>
@@ -1671,7 +1671,7 @@
   <xs:element name="vig-server">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="vig-address-type" type="xs:string"/>
+        <xs:element name="vig-address-type" type="xs:string" minOccurs="0"/>
         <xs:element name="ipaddress-v4-vig" type="xs:string" minOccurs="0" maxOccurs="5000"/>
         <xs:element name="ipaddress-v6-vig" type="xs:string" minOccurs="0" maxOccurs="5000"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
@@ -1689,7 +1689,7 @@
   <xs:element name="ipsec-configuration">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="ipsec-configuration-id" type="xs:string"/>
+        <xs:element name="ipsec-configuration-id" type="xs:string" minOccurs="0"/>
         <xs:element name="requested-vig-address-type" type="xs:string" minOccurs="0"/>
         <xs:element name="requested-encryption-strength" type="xs:string" minOccurs="0"/>
         <xs:element name="requested-dmz-type" type="xs:string" minOccurs="0"/>
@@ -1726,8 +1726,8 @@
   <xs:element name="route-table-reference">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="route-table-reference-id" type="xs:string"/>
-        <xs:element name="route-table-reference-fqdn" type="xs:string"/>
+        <xs:element name="route-table-reference-id" type="xs:string" minOccurs="0"/>
+        <xs:element name="route-table-reference-fqdn" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
       </xs:sequence>
@@ -1898,7 +1898,7 @@
   <xs:element name="vnf">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string"/>
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v9.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v9.xsd
index 08e5d5b..4c7aa6d 100644 (file)
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v9.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v9.xsd
@@ -113,14 +113,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="relationship-key" type="xs:string">
+        <xs:element name="relationship-key" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate an attribute.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="relationship-value" type="xs:string">
+        <xs:element name="relationship-value" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Value of the attribute.")</annox:annotate>
@@ -193,25 +193,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks",requiredProps="network-uuid,network-name,cvlan-tag")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="network-uuid" type="xs:string">
+        <xs:element name="network-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of the network. Unique across a cloud-region")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="network-name" type="xs:string">
+        <xs:element name="network-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the network.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
+        <xs:element name="cvlan-tag" type="xs:unsignedInt" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="cvlan-id")</annox:annotate>
@@ -259,18 +259,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches",requiredProps="switch-name,vcenter-url")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="switch-name" type="xs:string">
+        <xs:element name="switch-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="DVS switch name")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vcenter-url" type="xs:string">
+        <xs:element name="vcenter-url" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL used to reach the vcenter")</annox:annotate>
@@ -304,18 +304,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones",requiredProps="availability-zone-name,hypervisor-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="availability-zone-name" type="xs:string">
+        <xs:element name="availability-zone-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the availability zone.  Unique across a cloud region")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="hypervisor-type" type="xs:string">
+        <xs:element name="hypervisor-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of hypervisor.  Source of truth should define valid values.")</annox:annotate>
@@ -394,11 +394,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team.")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team.",requiredProps="update-node-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="update-node-type" type="xs:string"/>
+        <xs:element name="update-node-type" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:update-node-key" minOccurs="0" maxOccurs="5000"/>
         <xs:element name="update-node-uri" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:action" minOccurs="0" maxOccurs="5000"/>
@@ -416,7 +416,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
   <xs:element name="notify">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="event-id" type="xs:string"/>
+        <xs:element name="event-id" type="xs:string" minOccurs="0"/>
         <xs:element name="node-type" type="xs:string" minOccurs="0"/>
         <xs:element name="event-trigger" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:key-data" minOccurs="0" maxOccurs="5000"/>
@@ -441,25 +441,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools",requiredProps="target-pe,availability-zone-name,ctag-pool-purpose")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="target-pe" type="xs:string">
+        <xs:element name="target-pe" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="The Target provider edge router")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="availability-zone-name" type="xs:string">
+        <xs:element name="availability-zone-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the availability zone")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="ctag-pool-purpose" type="xs:string">
+        <xs:element name="ctag-pool-purpose" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Describes what the intended purpose of this pool is.")</annox:annotate>
@@ -495,11 +495,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure",requiredProps="physical-location-id,physical-location-type,street1,city,postal-code,country,region")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="physical-location-id" type="xs:string">
+        <xs:element name="physical-location-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier for physical location, e.g., CLLI")</annox:annotate>
@@ -534,20 +534,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="physical-location-type" type="xs:string">
+        <xs:element name="physical-location-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type, e.g., central office, data center.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="street1" type="xs:string"/>
+        <xs:element name="street1" type="xs:string" minOccurs="0"/>
         <xs:element name="street2" type="xs:string" minOccurs="0"/>
-        <xs:element name="city" type="xs:string"/>
+        <xs:element name="city" type="xs:string" minOccurs="0"/>
         <xs:element name="state" type="xs:string" minOccurs="0"/>
-        <xs:element name="postal-code" type="xs:string"/>
-        <xs:element name="country" type="xs:string"/>
-        <xs:element name="region" type="xs:string"/>
+        <xs:element name="postal-code" type="xs:string" minOccurs="0"/>
+        <xs:element name="country" type="xs:string" minOccurs="0"/>
+        <xs:element name="region" type="xs:string" minOccurs="0"/>
         <xs:element name="latitude" type="xs:string" minOccurs="0"/>
         <xs:element name="longitude" type="xs:string" minOccurs="0"/>
         <xs:element name="elevation" type="xs:string" minOccurs="0"/>
@@ -573,18 +573,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups",requiredProps="volume-group-id,volume-group-name,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="volume-group-id" type="xs:string">
+        <xs:element name="volume-group-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of volume-group.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="volume-group-name" type="xs:string">
+        <xs:element name="volume-group-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the volume group.")</annox:annotate>
@@ -598,7 +598,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -653,18 +653,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes",requiredProps="volume-id,volume-selflink")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="volume-id" type="xs:string">
+        <xs:element name="volume-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of block storage volume relative to the vserver.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="volume-selflink" type="xs:string">
+        <xs:element name="volume-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -698,11 +698,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface",requiredProps="l3-interface-ipv4-address")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="l3-interface-ipv4-address" type="xs:string">
+        <xs:element name="l3-interface-ipv4-address" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
@@ -766,11 +766,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface",requiredProps="l3-interface-ipv6-address")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="l3-interface-ipv6-address" type="xs:string">
+        <xs:element name="l3-interface-ipv6-address" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
@@ -834,11 +834,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-id",uniqueProps="vpn-id",dependentOn="l-interface",container="vlans")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-id",uniqueProps="vpn-id",dependentOn="l-interface",container="vlans",requiredProps="vlan-interface")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vlan-interface" type="xs:string">
+        <xs:element name="vlan-interface" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="String that identifies the interface")</annox:annotate>
@@ -925,11 +925,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs",requiredProps="pci-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="pci-id" type="xs:string">
+        <xs:element name="pci-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="PCI ID used to identify the sriov-vf")</annox:annotate>
@@ -1047,11 +1047,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface",container="l-interfaces",requiredProps="interface-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
+        <xs:element name="interface-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name given to the interface")</annox:annotate>
@@ -1145,18 +1145,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers",requiredProps="vserver-id,vserver-name,vserver-selflink,in-maint,is-closed-loop-disabled")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vserver-id" type="xs:string">
+        <xs:element name="vserver-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier for this vserver relative to its tenant")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vserver-name" type="xs:string">
+        <xs:element name="vserver-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of vserver")</annox:annotate>
@@ -1177,7 +1177,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vserver-selflink" type="xs:string">
+        <xs:element name="vserver-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -1227,18 +1227,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants",requiredProps="tenant-id,tenant-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="tenant-id" type="xs:string">
+        <xs:element name="tenant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id relative to the cloud-region.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="tenant-name" type="xs:string">
+        <xs:element name="tenant-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Readable name of tenant")</annox:annotate>
@@ -1273,18 +1273,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors",requiredProps="flavor-id,flavor-name,flavor-selflink")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="flavor-id" type="xs:string">
+        <xs:element name="flavor-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Flavor id, expected to be unique across cloud-region.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="flavor-name" type="xs:string">
+        <xs:element name="flavor-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Flavor name")</annox:annotate>
@@ -1333,7 +1333,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="flavor-selflink" type="xs:string">
+        <xs:element name="flavor-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -1374,25 +1374,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",dependentOn="cloud-region",container="group-assignments")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",dependentOn="cloud-region",container="group-assignments",requiredProps="group-id,group-type,group-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="group-id" type="xs:string">
+        <xs:element name="group-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Group id, expected to be unique across cloud-region.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="group-type" type="xs:string">
+        <xs:element name="group-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group type - the type of group this instance refers to")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="group-name" type="xs:string">
+        <xs:element name="group-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Group name - name assigned to the group")</annox:annotate>
@@ -1433,11 +1433,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots",requiredProps="snapshot-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="snapshot-id" type="xs:string">
+        <xs:element name="snapshot-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Snapshot id, this is the key UUID assoc associated in glance with the snapshots.")</annox:annotate>
@@ -1534,18 +1534,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata",requiredProps="metaname,metaval")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="metaname" type="xs:string">
+        <xs:element name="metaname" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="metaval" type="xs:string"/>
+        <xs:element name="metaval" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -1572,18 +1572,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images",requiredProps="image-id,image-name,image-os-distro,image-os-version,image-selflink")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="image-id" type="xs:string">
+        <xs:element name="image-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Image id, expected to be unique across cloud region")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-name" type="xs:string">
+        <xs:element name="image-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Image name")</annox:annotate>
@@ -1597,14 +1597,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-os-distro" type="xs:string">
+        <xs:element name="image-os-distro" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-os-version" type="xs:string">
+        <xs:element name="image-os-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The operating system version as specified by the distributor.")</annox:annotate>
@@ -1632,7 +1632,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="image-selflink" type="xs:string">
+        <xs:element name="image-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
@@ -1679,18 +1679,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure",requiredProps="cloud-owner,cloud-region-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="cloud-owner" type="xs:string">
+        <xs:element name="cloud-owner" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="cloud-region-id" type="xs:string">
+        <xs:element name="cloud-region-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifier used by the vendor for the region. Second part of composite key")</annox:annotate>
@@ -1775,11 +1775,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure",requiredProps="nm-profile-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="nm-profile-name" type="xs:string">
+        <xs:element name="nm-profile-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique name of network profile.")</annox:annotate>
@@ -1820,11 +1820,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",requiredProps="interface-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
+        <xs:element name="interface-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name that identifies the physical interface")</annox:annotate>
@@ -1908,11 +1908,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces",requiredProps="interface-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
+        <xs:element name="interface-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name that identifies the link aggregate interface")</annox:annotate>
@@ -1989,11 +1989,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",container="pservers",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",container="pservers",namespace="cloud-infrastructure",requiredProps="hostname,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="hostname" type="xs:string">
+        <xs:element name="hostname" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Value from executing hostname on the compute node.")</annox:annotate>
@@ -2190,18 +2190,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure",requiredProps="vdc-id,vdc-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vdc-id" type="xs:string">
+        <xs:element name="vdc-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vdc")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vdc-name" type="xs:string">
+        <xs:element name="vdc-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the virtual data center")</annox:annotate>
@@ -2251,11 +2251,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version",container="connectors",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version",container="connectors",namespace="business",requiredProps="resource-instance-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="resource-instance-id" type="xs:string">
+        <xs:element name="resource-instance-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of resource instance.")</annox:annotate>
@@ -2325,39 +2325,39 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects",requiredProps="id,bandwidth-up-wan1,bandwidth-down-wan1,bandwidth-up-wan2,bandwidth-down-wan2")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="id" type="xs:string">
+        <xs:element name="id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="bandwidth-up-wan1" type="xs:string">
+        <xs:element name="bandwidth-up-wan1" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The WAN uplink bandwidth for WAN1")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="bandwidth-down-wan1" type="xs:string">
+        <xs:element name="bandwidth-down-wan1" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The WAN downlink bandwidth for WAN1")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="bandwidth-up-wan2" type="xs:string">
+        <xs:element name="bandwidth-up-wan2" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The WAN uplink bandwidth for WAN2")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="bandwidth-down-wan2" type="xs:string">
+        <xs:element name="bandwidth-down-wan2" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The WAN downlink bandwidth for WAN2")</annox:annotate>
@@ -2391,11 +2391,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,persona-model-id,persona-model-version",dependentOn="service-instance",container="allotted-resources")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,persona-model-id,persona-model-version",dependentOn="service-instance",container="allotted-resources",requiredProps="id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="id" type="xs:string">
+        <xs:element name="id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
@@ -2472,11 +2472,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",requiredProps="service-instance-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-instance-id" type="xs:string">
+        <xs:element name="service-instance-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this instance of a service")</annox:annotate>
@@ -2617,11 +2617,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type",requiredProps="service-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
+        <xs:element name="service-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Value defined by orchestration to identify this service across ECOMP.")</annox:annotate>
@@ -2663,25 +2663,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business",requiredProps="global-customer-id,subscriber-name,subscriber-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="global-customer-id" type="xs:string">
+        <xs:element name="global-customer-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Global customer id used across ECOMP to uniquely identify customer.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="subscriber-name" type="xs:string">
+        <xs:element name="subscriber-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Subscriber name, an alternate way to retrieve a customer.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="subscriber-type" type="xs:string">
+        <xs:element name="subscriber-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Subscriber type, a way to provide VID with only the INFRA customers.",defaultValue="CUST")</annox:annotate>
@@ -2729,25 +2729,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation",requiredProps="vnf-image-uuid,application,application-vendor")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-image-uuid" type="xs:string">
+        <xs:element name="vnf-image-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of this asset")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="application" type="xs:string">
+        <xs:element name="application" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="application-vendor" type="xs:string">
+        <xs:element name="application-vendor" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
@@ -2795,18 +2795,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation",requiredProps="service-id,service-description")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-id" type="xs:string">
+        <xs:element name="service-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="service-description" type="xs:string">
+        <xs:element name="service-description" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Description of the service")</annox:annotate>
@@ -2854,18 +2854,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation",requiredProps="service-type,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
+        <xs:element name="service-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -2899,18 +2899,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets",requiredProps="element-choice-set-uuid,element-choice-set-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="element-choice-set-uuid" type="xs:string">
+        <xs:element name="element-choice-set-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="element-choice-set-name" type="xs:string"/>
+        <xs:element name="element-choice-set-name" type="xs:string" minOccurs="0"/>
         <xs:element name="cardinality" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:model-elements" minOccurs="0"/>
@@ -2929,19 +2929,19 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets",requiredProps="constrained-element-set-uuid,constraint-type,check-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="constrained-element-set-uuid" type="xs:string">
+        <xs:element name="constrained-element-set-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="check-type" type="xs:string"/>
+        <xs:element name="constraint-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="check-type" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:element-choice-sets" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -2959,18 +2959,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints",requiredProps="model-constraint-uuid,constrained-element-set-uuid-to-replace")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-constraint-uuid" type="xs:string">
+        <xs:element name="model-constraint-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string"/>
+        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:constrained-element-sets" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
@@ -2993,25 +2993,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements",requiredProps="model-element-uuid,new-data-del-flag,cardinality")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-element-uuid" type="xs:string">
+        <xs:element name="model-element-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="new-data-del-flag" type="xs:string">
+        <xs:element name="new-data-del-flag" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates whether this element was created as part of instantiation from this model")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="cardinality" type="xs:string">
+        <xs:element name="cardinality" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="How many of this type of element are required/allowed")</annox:annotate>
@@ -3055,25 +3055,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version",uniqueProps="model-version-id",container="model-vers")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version",uniqueProps="model-version-id",container="model-vers",requiredProps="model-version-id,model-name,model-version")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-version-id" type="xs:string">
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-name" type="xs:string">
+        <xs:element name="model-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-version" type="xs:string">
+        <xs:element name="model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate>
@@ -3111,18 +3111,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation",requiredProps="model-invariant-id,model-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string">
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-type" type="xs:string">
+        <xs:element name="model-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>
@@ -3157,21 +3157,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups",requiredProps="related-lookup-uuid,source-node-type,source-node-property,target-node-type,target-node-property")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="related-lookup-uuid" type="xs:string">
+        <xs:element name="related-lookup-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="source-node-type" type="xs:string"/>
-        <xs:element name="source-node-property" type="xs:string"/>
-        <xs:element name="target-node-type" type="xs:string"/>
-        <xs:element name="target-node-property" type="xs:string"/>
+        <xs:element name="source-node-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="source-node-property" type="xs:string" minOccurs="0"/>
+        <xs:element name="target-node-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="target-node-property" type="xs:string" minOccurs="0"/>
         <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="5000"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
@@ -3189,20 +3189,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints",requiredProps="property-constraint-uuid,constraint-type,property-name,property-value")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="property-constraint-uuid" type="xs:string">
+        <xs:element name="property-constraint-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="property-name" type="xs:string"/>
-        <xs:element name="property-value" type="xs:string"/>
+        <xs:element name="constraint-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
@@ -3218,11 +3218,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements",requiredProps="named-query-element-uuid")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="named-query-element-uuid" type="xs:string">
+        <xs:element name="named-query-element-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
@@ -3251,19 +3251,19 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation",requiredProps="named-query-uuid,named-query-name,named-query-version")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="named-query-uuid" type="xs:string">
+        <xs:element name="named-query-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="named-query-name" type="xs:string"/>
-        <xs:element name="named-query-version" type="xs:string"/>
+        <xs:element name="named-query-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="named-query-version" type="xs:string" minOccurs="0"/>
         <xs:element name="required-input-params" minOccurs="0">
           <xs:complexType>
             <xs:sequence>
@@ -3305,18 +3305,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",requiredProps="link-name,link-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
+        <xs:element name="link-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="link-type" type="xs:string">
+        <xs:element name="link-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of logical link, e.g., evc")</annox:annotate>
@@ -3466,7 +3466,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="cos" type="xs:string">
+        <xs:element name="cos" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
@@ -3518,7 +3518,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="site-pair-id" type="xs:string">
+        <xs:element name="site-pair-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
@@ -3592,7 +3592,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="routing-instance-id" type="xs:string">
+        <xs:element name="routing-instance-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of routing instance")</annox:annotate>
@@ -3634,11 +3634,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network",requiredProps="site-pair-set-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="site-pair-set-id" type="xs:string">
+        <xs:element name="site-pair-set-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of site pair set.")</annox:annotate>
@@ -3673,25 +3673,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,global-route-target,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,global-route-target,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",requiredProps="vpn-id,vpn-name,global-route-target,route-target-role")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vpn-id" type="xs:string">
+        <xs:element name="vpn-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="VPN ID, globally unique within A&amp;AI")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vpn-name" type="xs:string">
+        <xs:element name="vpn-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VPN Name")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="global-route-target" type="xs:string">
+        <xs:element name="global-route-target" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Number used to identify a VPN, globally unique in the network",dataLink="./route-targets/route-target/{global-route-target}/{route-target-role}")</annox:annotate>
@@ -3719,7 +3719,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="route-target-role" type="xs:string">
+        <xs:element name="route-target-role" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Role assigned to this route target",dataLink="./route-targets/route-target/{global-route-target}/{route-target-role}",defaultValue="BOTH")</annox:annotate>
@@ -3754,11 +3754,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network",requiredProps="equipment-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="equipment-name" type="xs:string">
+        <xs:element name="equipment-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
@@ -3826,21 +3826,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="multicast-configuration-id" type="xs:string">
+        <xs:element name="multicast-configuration-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of multicast configuration.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="multicast-protocol" type="xs:string">
+        <xs:element name="multicast-protocol" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="protocol of multicast configuration")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="rp-type" type="xs:string">
+        <xs:element name="rp-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="rp type of multicast configuration")</annox:annotate>
@@ -3878,7 +3878,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
+        <xs:element name="cvlan-tag" type="xs:unsignedInt" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="See mis-na-virtualization-platform.yang")</annox:annotate>
@@ -3907,11 +3907,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",requiredProps="interface-id,orchestration-status")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="interface-id" type="xs:string">
+        <xs:element name="interface-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the interface")</annox:annotate>
@@ -3967,7 +3967,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="orchestration-status" type="xs:string">
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
@@ -4004,18 +4004,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses",requiredProps="group-uuid,resource-uuid")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
+        <xs:element name="group-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the license group the resource belongs to, should be uuid.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
+        <xs:element name="resource-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of a license resource. ")</annox:annotate>
@@ -4049,18 +4049,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements",requiredProps="group-uuid,resource-uuid")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
+        <xs:element name="group-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the entitlement group the resource comes from, should be uuid.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
+        <xs:element name="resource-uuid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of an entitlement resource. ")</annox:annotate>
@@ -4094,18 +4094,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
@@ -4119,7 +4119,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -4258,21 +4258,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnfc-name" type="xs:string">
+        <xs:element name="vnfc-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of vnfc.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnfc-function-code" type="xs:string">
+        <xs:element name="vnfc-function-code" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="function code",dbAlias="nfc-naming-code")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnfc-type" type="xs:string">
+        <xs:element name="vnfc-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="type",dbAlias="nfc-function")</annox:annotate>
@@ -4352,7 +4352,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="subnet-id" type="xs:string">
+        <xs:element name="subnet-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Subnet ID, should be UUID.")</annox:annotate>
@@ -4455,7 +4455,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt">
+        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="id.")</annox:annotate>
@@ -4484,11 +4484,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments",requiredProps="segmentation-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="segmentation-id" type="xs:string">
+        <xs:element name="segmentation-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
@@ -4522,18 +4522,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",requiredProps="network-id,network-name,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="network-id" type="xs:string">
+        <xs:element name="network-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Network ID, should be uuid. Unique across A&amp;AI.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="network-name" type="xs:string">
+        <xs:element name="network-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the network, governed by some naming convention..")</annox:annotate>
@@ -4729,7 +4729,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="network-policy-id" type="xs:string">
+        <xs:element name="network-policy-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID representing unique key to this instance")</annox:annotate>
@@ -4772,11 +4772,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules",requiredProps="vf-module-id,is-base-vf-module")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vf-module-id" type="xs:string">
+        <xs:element name="vf-module-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of vf-module.")</annox:annotate>
@@ -4901,18 +4901,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",requiredProps="vnf-id,vnf-name,vnf-type,in-maint,is-closed-loop-disabled")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
@@ -4926,7 +4926,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -5196,11 +5196,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network",requiredProps="link-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
+        <xs:element name="link-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Alphabetical concatenation of lag-interface names")</annox:annotate>
@@ -5234,18 +5234,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network",requiredProps="vnf-id2,vnf-name,vnf-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id2" type="xs:string">
+        <xs:element name="vnf-id2" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF, can't use same attribute name right now until we promote this new object")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
@@ -5259,7 +5259,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
+        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
@@ -5357,11 +5357,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",requiredProps="pnf-name,in-maint")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="pnf-name" type="xs:string">
+        <xs:element name="pnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique name of Physical Network Function.")</annox:annotate>
@@ -5537,11 +5537,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id",requiredProps="link-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
+        <xs:element name="link-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ")</annox:annotate>
@@ -5617,11 +5617,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers",requiredProps="vig-address-type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vig-address-type" type="xs:string">
+        <xs:element name="vig-address-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="indicates whether the VIG is for AVPN or INTERNET")</annox:annotate>
@@ -5664,11 +5664,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network",requiredProps="ipsec-configuration-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="ipsec-configuration-id" type="xs:string">
+        <xs:element name="ipsec-configuration-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of this configuration")</annox:annotate>
@@ -5838,18 +5838,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network",requiredProps="route-table-reference-id,route-table-reference-fqdn")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="route-table-reference-id" type="xs:string">
+        <xs:element name="route-table-reference-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="route-table-reference-fqdn" type="xs:string">
+        <xs:element name="route-table-reference-fqdn" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="FQDN entry in the route table.")</annox:annotate>
@@ -5883,25 +5883,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description",uniqueProps="id",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description",uniqueProps="id",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network",requiredProps="id,description,type")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="id" type="xs:string">
+        <xs:element name="id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Instance Group ID, UUID assigned to this instance.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="description" type="xs:string">
+        <xs:element name="description" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Descriptive text to help identify the usage of this instance-group")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="type" type="xs:string">
+        <xs:element name="type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability")</annox:annotate>
@@ -5942,32 +5942,32 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network",requiredProps="zone-id,zone-name,design-type,zone-context")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="zone-id" type="xs:string">
+        <xs:element name="zone-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Code assigned by AIC to the zone")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="zone-name" type="xs:string">
+        <xs:element name="zone-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="English name associated with the zone")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="design-type" type="xs:string">
+        <xs:element name="design-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Design of zone [Medium/Large?]")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="zone-context" type="xs:string">
+        <xs:element name="zone-context" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Context of zone [production/test]")</annox:annotate>
@@ -6109,46 +6109,46 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models",requiredProps="model-invariant-id,model-name-version-id,model-type,model-name,model-id,model-version")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string">
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-name-version-id" type="xs:string">
+        <xs:element name="model-name-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-type" type="xs:string">
+        <xs:element name="model-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-name" type="xs:string">
+        <xs:element name="model-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-id" type="xs:string">
+        <xs:element name="model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-version" type="xs:string">
+        <xs:element name="model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate>
@@ -6304,11 +6304,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true",requiredProps="vnf-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>

diff --git a/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml b/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml
index cc143c8..9397c15 100644 (file)
--- a/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
 
     ============LICENSE_START=======================================================
@@ -21,8 +20,7 @@
 
     ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
--->
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v10" xml-mapping-metadata-complete="true">
+--><xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v10" xml-mapping-metadata-complete="true">
     <xml-schema element-form-default="QUALIFIED">
         <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v10"/>
     </xml-schema>
@@ -175,6 +173,7 @@
         <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-property name="requiredProps" value="update-node-type"/>
             </xml-properties>
             <xml-root-element name="update"/>
             <java-attributes>
@@ -257,7 +256,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">
@@ -312,12 +311,13 @@
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation" />
+                <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation"/>
                 <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type"/>
                 <xml-property name="nameProps" value="owner-defined-type"/>
                 <xml-property name="container" value="cloud-regions"/>
                 <xml-property name="namespace" value="cloud-infrastructure"/>
                 <xml-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">
@@ -382,6 +382,7 @@
                 <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>
 
@@ -510,6 +511,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>
 
@@ -556,6 +558,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>
 
@@ -601,6 +604,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>
 
@@ -671,6 +675,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>
 
@@ -762,6 +767,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"/>
             </xml-properties>
         </java-type>
 
@@ -855,6 +861,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>
 
@@ -908,6 +915,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"/>
             <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>
 
@@ -987,6 +995,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"/>
             </xml-properties>
         </java-type>
 
@@ -1040,6 +1049,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"/>
             <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>
 
@@ -1079,6 +1089,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>
 
@@ -1159,6 +1170,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>
 
@@ -1240,6 +1252,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>
 
@@ -1291,6 +1304,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>
 
@@ -1367,6 +1381,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>
 
@@ -1397,6 +1412,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>
 
@@ -1436,6 +1452,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>
 
@@ -1475,6 +1492,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>
 
@@ -1633,6 +1651,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>
 
@@ -1710,6 +1729,7 @@
                 <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>
 
@@ -1781,6 +1801,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>
 
@@ -1836,6 +1857,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>
 
@@ -1880,6 +1902,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>
 
@@ -1920,6 +1943,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>
 
@@ -2000,6 +2024,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>
 
@@ -2052,6 +2077,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>
 
@@ -2094,6 +2120,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>
 
@@ -2217,6 +2244,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>
 
@@ -2281,11 +2309,12 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge."/>
-                <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version" />
-                <xml-property name="uniqueProps" value="vnf-image-uuid" />
+                <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version"/>
+                <xml-property name="uniqueProps" value="vnf-image-uuid"/>
                 <xml-property name="container" value="vnf-images"/>
                 <xml-property name="namespace" value="service-design-and-creation"/>
                 <xml-property name="uriTemplate" value="/service-design-and-creation/vnf-images/vnf-image/{att-uuid}"/>
+            <xml-property name="requiredProps" value="vnf-image-uuid,application,application-vendor"/>
             </xml-properties>
         </java-type>
 
@@ -2335,6 +2364,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>
 
@@ -2374,6 +2404,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>
 
@@ -2439,7 +2470,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">
@@ -2531,6 +2562,7 @@
                 <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,link-type"/>
             </xml-properties>
         </java-type>
 
@@ -2567,6 +2599,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>
 
@@ -2769,6 +2802,7 @@
                 <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>
 
@@ -2821,6 +2855,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>
 
@@ -2991,6 +3026,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>
 
@@ -3069,6 +3105,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>
 
@@ -3352,6 +3389,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">
@@ -3618,32 +3656,32 @@
                 </xml-element>
                 <xml-element java-attribute="vcpu" name="vcpu" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only in some usecases" />
+                        <xml-property name="description" value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only in some usecases"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vcpuUnits" name="vcpu-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only in some usecases" />
+                        <xml-property name="description" value="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only in some usecases"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vmemory" name="vmemory" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only in some usecases" />
+                        <xml-property name="description" value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only in some usecases"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vmemoryUnits" name="vmemory-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only in some usecases" />
+                        <xml-property name="description" value="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only in some usecases"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vdisk" name="vdisk" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only in some usecases" />
+                        <xml-property name="description" value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only in some usecases"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vdiskUnits" name="vdisk-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only in some usecases" />
+                        <xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only in some usecases"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
@@ -3786,6 +3824,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>
 
@@ -3896,6 +3935,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"/>
             </xml-properties>
         </java-type>
 
@@ -3931,6 +3971,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>
 
@@ -4029,6 +4070,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>
 
@@ -4171,6 +4213,7 @@
                 <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>
 
@@ -4240,6 +4283,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>
 
@@ -4281,6 +4325,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>
 
@@ -4311,7 +4356,7 @@
                 </xml-element>
                 <xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="can offer a shared DMZ or a DMZ specific to a customer" />
+                        <xml-property name="description" value="can offer a shared DMZ or a DMZ specific to a customer"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String">
@@ -4414,6 +4459,7 @@
                 <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-property name="requiredProps" value="ipsec-configuration-id"/>
             </xml-properties>
         </java-type>
 
@@ -4506,6 +4552,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">
@@ -4545,6 +4592,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">
@@ -4594,6 +4642,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>
@@ -4649,6 +4698,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>
@@ -4683,6 +4733,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>
@@ -4715,6 +4766,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>
@@ -4747,6 +4799,7 @@
                 <xml-property name="container" value="named-queries"/>
                 <xml-property name="namespace" value="service-design-and-creation"/>
                 <xml-property name="uriTemplate" value="/service-design-and-creation/named-queries/named-query/{named-query-uuid}"/>
+            <xml-property name="requiredProps" value="named-query-uuid,named-query-name,named-query-version"/>
             </xml-properties>
             <xml-root-element name="named-query"/>
             <java-attributes>
@@ -4779,6 +4832,7 @@
                 <xml-property name="allowDirectWrite" value="false"/>
                 <xml-property name="container" value="named-query-elements"/>
                 <xml-property name="uriTemplate" value="/named-query-elements/named-query-element/{named-query-element-uuid}"/>
+            <xml-property name="requiredProps" value="named-query-element-uuid"/>
             </xml-properties>
             <xml-root-element name="named-query-element"/>
             <java-attributes>
@@ -4814,6 +4868,7 @@
                 <xml-property name="allowDirectWrite" value="false"/>
                 <xml-property name="container" value="related-lookups"/>
                 <xml-property name="uriTemplate" value="/related-lookups/related-lookup/{related-lookup-uuid}"/>
+            <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>
@@ -4848,6 +4903,7 @@
                 <xml-property name="allowDirectWrite" value="false"/>
                 <xml-property name="container" value="property-constraints"/>
                 <xml-property name="uriTemplate" value="/property-constraints/property-constraint/{property-constraint-uuid}"/>
+            <xml-property name="requiredProps" value="property-constraint-uuid,constraint-type,property-name,property-value"/>
             </xml-properties>
             <xml-root-element name="property-constraint"/>
             <java-attributes>
@@ -4892,6 +4948,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">
@@ -5083,6 +5140,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>
 
@@ -5137,6 +5195,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,type"/>
             </xml-properties>
         </java-type>
 
@@ -5172,6 +5231,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>
 
@@ -5265,6 +5325,7 @@
                 <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>
 
@@ -5322,6 +5383,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,bandwidth-up-wan1,bandwidth-down-wan1,bandwidth-up-wan2,bandwidth-down-wan2"/>
             </xml-properties>
         </java-type>
 
@@ -5361,6 +5423,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>
 
@@ -5401,6 +5464,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>
 
@@ -5419,6 +5483,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>
 
@@ -5475,6 +5540,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">
@@ -5512,6 +5578,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>
     </java-types>

diff --git a/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml b/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml
index ce6f17a..b25b714 100644 (file)
--- a/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
 
     ============LICENSE_START=======================================================
@@ -21,10 +20,9 @@
 
     ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
--->
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v11" xml-mapping-metadata-complete="true">
+--><xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v11" xml-mapping-metadata-complete="true">
     <xml-schema element-form-default="QUALIFIED">
-               <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v11" />
+               <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v11"/>
     </xml-schema>
     <java-types>
         <java-type name="Inventory">
@@ -33,7 +31,7 @@
                 <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v11.Search"/>
                 <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v11.Actions"/>
                 <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v11.CloudInfrastructure"/>
-                               <xml-element java-attribute="externalSystem" name="external-system" type="inventory.aai.onap.org.v11.ExternalSystem" />
+                               <xml-element java-attribute="externalSystem" name="external-system" type="inventory.aai.onap.org.v11.ExternalSystem"/>
                 <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v11.Business"/>
                 <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v11.ServiceDesignAndCreation"/>
                 <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v11.Network"/>
@@ -176,6 +174,7 @@
         <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-property name="requiredProps" value="update-node-type"/>
             </xml-properties>
             <xml-root-element name="update"/>
             <java-attributes>
@@ -231,266 +230,270 @@
 
                <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.v11.EsrEmsList" />
-                               <xml-element java-attribute="esrVnfmList" name="esr-vnfm-list" type="inventory.aai.onap.org.v11.EsrVnfmList" />
-                               <xml-element java-attribute="esrThirdpartySdncList" name="esr-thirdparty-sdnc-list" type="inventory.aai.onap.org.v11.EsrThirdpartySdncList" />
+                               <xml-element java-attribute="esrEmsList" name="esr-ems-list" type="inventory.aai.onap.org.v11.EsrEmsList"/>
+                               <xml-element java-attribute="esrVnfmList" name="esr-vnfm-list" type="inventory.aai.onap.org.v11.EsrVnfmList"/>
+                               <xml-element java-attribute="esrThirdpartySdncList" name="esr-thirdparty-sdnc-list" type="inventory.aai.onap.org.v11.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.v11.EsrEms" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrEms" name="esr-ems" type="inventory.aai.onap.org.v11.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.v11.EsrSystemInfoList" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v11.EsrSystemInfoList"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.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.v11.EsrVnfm" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrVnfm" name="esr-vnfm" type="inventory.aai.onap.org.v11.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.v11.EsrSystemInfoList" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v11.EsrSystemInfoList"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.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.v11.EsrThirdpartySdnc" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrThirdpartySdnc" name="esr-thirdparty-sdnc" type="inventory.aai.onap.org.v11.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.v11.EsrSystemInfoList" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v11.EsrSystemInfoList"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.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.v11.EsrSystemInfo" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v11.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="resourceVersion" name="resource-version" type="java.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.v11.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Persist common address information of external systems." />
-                               <xml-property name="indexedProps" value="esr-system-info-id,system-name,system-type" />
-                               <xml-property name="searchable" value="esr-system-info-id,system-name,system-type" />
-                               <xml-property name="container" value="esr-system-info-list" />
-                               <xml-property name="dependentOn" value="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc" />
-                       </xml-properties>
+                               <xml-property name="description" value="Persist common address information of external systems."/>
+                               <xml-property name="indexedProps" value="esr-system-info-id,system-name,system-type"/>
+                               <xml-property name="searchable" value="esr-system-info-id,system-name,system-type"/>
+                               <xml-property name="container" value="esr-system-info-list"/>
+                               <xml-property name="dependentOn" value="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc"/>
+                       <xml-property name="requiredProps" value="esr-system-info-id,user-name,password,system-type"/>
+            </xml-properties>
                </java-type>
 
         <java-type name="CloudInfrastructure">
@@ -590,7 +593,7 @@
                 <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v11.OamNetworks"/>
                 <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v11.AvailabilityZones"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
-                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v11.EsrSystemInfoList" />
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v11.EsrSystemInfoList"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v11.VipIpv4AddressList"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v11.VipIpv6AddressList"/>
             </java-attributes>
@@ -601,6 +604,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">
@@ -665,6 +669,7 @@
                 <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>
 
@@ -793,6 +798,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>
 
@@ -839,6 +845,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>
 
@@ -889,6 +896,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>
 
@@ -959,6 +967,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>
 
@@ -1066,6 +1075,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>
 
@@ -1159,6 +1169,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>
 
@@ -1212,6 +1223,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"/>
             <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>
 
@@ -1302,6 +1314,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>
 
@@ -1355,6 +1368,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"/>
             <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>
 
@@ -1394,6 +1408,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>
 
@@ -1474,6 +1489,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>
 
@@ -1555,6 +1571,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>
 
@@ -1606,6 +1623,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>
 
@@ -1682,6 +1700,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>
 
@@ -1712,6 +1731,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>
 
@@ -1751,6 +1771,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>
 
@@ -1790,6 +1811,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>
 
@@ -1958,6 +1980,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>
 
@@ -2046,6 +2069,7 @@
                 <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>
 
@@ -2117,6 +2141,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>
 
@@ -2172,6 +2197,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>
 
@@ -2216,6 +2242,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>
 
@@ -2256,6 +2283,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>
 
@@ -2306,6 +2334,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>
 
@@ -2375,6 +2404,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>
 
@@ -2427,6 +2457,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>
 
@@ -2462,6 +2493,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>
 
@@ -2503,6 +2535,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>
 
@@ -2538,6 +2571,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>
 
@@ -2580,6 +2614,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>
 
@@ -2628,17 +2663,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 -->
@@ -2739,6 +2774,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>
 
@@ -2808,6 +2844,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>
 
@@ -2857,6 +2894,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>
 
@@ -2896,6 +2934,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>
 
@@ -3023,6 +3062,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,configuration-sub-type,orchestration-status,operational-status,configuration-selflink,model-customization-id"/>
             </xml-properties>
         </java-type>
 
@@ -3159,6 +3199,7 @@
                 <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>
 
@@ -3195,6 +3236,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>
 
@@ -3406,6 +3448,7 @@
                 <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>
 
@@ -3458,6 +3501,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>
 
@@ -3628,6 +3672,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>
 
@@ -3706,6 +3751,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>
 
@@ -4011,6 +4057,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">
@@ -4206,7 +4253,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">
@@ -4343,17 +4390,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">
@@ -4518,6 +4565,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>
 
@@ -4628,6 +4676,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"/>
             </xml-properties>
         </java-type>
 
@@ -4663,6 +4712,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>
 
@@ -4761,6 +4811,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>
 
@@ -4903,6 +4954,7 @@
                 <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>
 
@@ -4992,6 +5044,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>
 
@@ -5033,6 +5086,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>
 
@@ -5166,6 +5220,7 @@
                 <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-property name="requiredProps" value="ipsec-configuration-id"/>
             </xml-properties>
         </java-type>
 
@@ -5258,6 +5313,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">
@@ -5297,6 +5353,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">
@@ -5346,6 +5403,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>
@@ -5401,6 +5459,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>
@@ -5435,6 +5494,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>
@@ -5467,6 +5527,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>
@@ -5499,6 +5560,7 @@
                 <xml-property name="container" value="named-queries"/>
                 <xml-property name="namespace" value="service-design-and-creation"/>
                 <xml-property name="uriTemplate" value="/service-design-and-creation/named-queries/named-query/{named-query-uuid}"/>
+            <xml-property name="requiredProps" value="named-query-uuid,named-query-name,named-query-version"/>
             </xml-properties>
             <xml-root-element name="named-query"/>
             <java-attributes>
@@ -5531,6 +5593,7 @@
                 <xml-property name="allowDirectWrite" value="false"/>
                 <xml-property name="container" value="named-query-elements"/>
                 <xml-property name="uriTemplate" value="/named-query-elements/named-query-element/{named-query-element-uuid}"/>
+            <xml-property name="requiredProps" value="named-query-element-uuid"/>
             </xml-properties>
             <xml-root-element name="named-query-element"/>
             <java-attributes>
@@ -5566,6 +5629,7 @@
                 <xml-property name="allowDirectWrite" value="false"/>
                 <xml-property name="container" value="related-lookups"/>
                 <xml-property name="uriTemplate" value="/related-lookups/related-lookup/{related-lookup-uuid}"/>
+            <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>
@@ -5600,6 +5664,7 @@
                 <xml-property name="allowDirectWrite" value="false"/>
                 <xml-property name="container" value="property-constraints"/>
                 <xml-property name="uriTemplate" value="/property-constraints/property-constraint/{property-constraint-uuid}"/>
+            <xml-property name="requiredProps" value="property-constraint-uuid,constraint-type,property-name,property-value"/>
             </xml-properties>
             <xml-root-element name="property-constraint"/>
             <java-attributes>
@@ -5644,6 +5709,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">
@@ -5835,6 +5901,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>
 
@@ -5918,6 +5985,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,type"/>
             </xml-properties>
         </java-type>
 
@@ -5953,6 +6021,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>
 
@@ -6046,6 +6115,7 @@
                 <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>
 
@@ -6103,6 +6173,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>
 
@@ -6142,6 +6213,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>
 
@@ -6182,6 +6254,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>
 
@@ -6200,6 +6273,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>
 
@@ -6256,6 +6330,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">
@@ -6293,6 +6368,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>
 
@@ -6326,6 +6402,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>
 
@@ -6422,6 +6499,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>
 
@@ -6475,6 +6553,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>
     </java-types>

diff --git a/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml b/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml
index 5d43d43..58d4de1 100644 (file)
--- a/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   ============LICENSE_START=======================================================
   org.onap.aai
@@ -18,7 +17,7 @@
   limitations under the License.
   ============LICENSE_END=========================================================
   -->
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v12" xml-mapping-metadata-complete="true">
+  <xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v12" xml-mapping-metadata-complete="true">
     <xml-schema element-form-default="QUALIFIED">
         <xml-ns namespace-uri="http://org.onap.aai.inventory/v12"/>
     </xml-schema>
@@ -29,7 +28,7 @@
                 <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v12.Search"/>
                 <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v12.Actions"/>
                 <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v12.CloudInfrastructure"/>
-                               <xml-element java-attribute="externalSystem" name="external-system" type="inventory.aai.onap.org.v12.ExternalSystem" />
+                               <xml-element java-attribute="externalSystem" name="external-system" type="inventory.aai.onap.org.v12.ExternalSystem"/>
                 <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v12.Business"/>
                 <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v12.ServiceDesignAndCreation"/>
                 <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v12.Network"/>
@@ -172,6 +171,7 @@
         <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-property name="requiredProps" value="update-node-type"/>
             </xml-properties>
             <xml-root-element name="update"/>
             <java-attributes>
@@ -227,266 +227,270 @@
 
                <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.v12.EsrEmsList" />
-                               <xml-element java-attribute="esrVnfmList" name="esr-vnfm-list" type="inventory.aai.onap.org.v12.EsrVnfmList" />
-                               <xml-element java-attribute="esrThirdpartySdncList" name="esr-thirdparty-sdnc-list" type="inventory.aai.onap.org.v12.EsrThirdpartySdncList" />
+                               <xml-element java-attribute="esrEmsList" name="esr-ems-list" type="inventory.aai.onap.org.v12.EsrEmsList"/>
+                               <xml-element java-attribute="esrVnfmList" name="esr-vnfm-list" type="inventory.aai.onap.org.v12.EsrVnfmList"/>
+                               <xml-element java-attribute="esrThirdpartySdncList" name="esr-thirdparty-sdnc-list" type="inventory.aai.onap.org.v12.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.v12.EsrEms" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrEms" name="esr-ems" type="inventory.aai.onap.org.v12.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.v12.EsrSystemInfoList" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v12.EsrSystemInfoList"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.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.v12.EsrVnfm" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrVnfm" name="esr-vnfm" type="inventory.aai.onap.org.v12.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.v12.EsrSystemInfoList" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v12.EsrSystemInfoList"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.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.v12.EsrThirdpartySdnc" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrThirdpartySdnc" name="esr-thirdparty-sdnc" type="inventory.aai.onap.org.v12.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.v12.EsrSystemInfoList" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v12.EsrSystemInfoList"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.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.v12.EsrSystemInfo" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v12.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="resourceVersion" name="resource-version" type="java.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.v12.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Persist common address information of external systems." />
-                               <xml-property name="indexedProps" value="esr-system-info-id,system-name,system-type" />
-                               <xml-property name="searchable" value="esr-system-info-id,system-name,system-type" />
-                               <xml-property name="container" value="esr-system-info-list" />
-                               <xml-property name="dependentOn" value="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc" />
-                       </xml-properties>
+                               <xml-property name="description" value="Persist common address information of external systems."/>
+                               <xml-property name="indexedProps" value="esr-system-info-id,system-name,system-type"/>
+                               <xml-property name="searchable" value="esr-system-info-id,system-name,system-type"/>
+                               <xml-property name="container" value="esr-system-info-list"/>
+                               <xml-property name="dependentOn" value="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc"/>
+                       <xml-property name="requiredProps" value="esr-system-info-id,user-name,password,system-type"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="HpaCapabilities">
@@ -535,7 +539,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">
@@ -562,7 +567,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">
@@ -595,7 +601,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">
@@ -640,12 +646,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="cloudEpaCaps" name="cloud-epa-caps" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="MultiVIM will discover and expose EPA capabilities." />
+                                               <xml-property name="description" value="MultiVIM will discover and expose EPA capabilities."/>
                                        </xml-properties>
                                </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
@@ -670,15 +676,16 @@
                                                <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.v12.EsrSystemInfoList" />
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v12.EsrSystemInfoList"/>
             </java-attributes>
             <xml-properties>
-                               <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." />
+                               <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation."/>
                 <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type"/>
                 <xml-property name="nameProps" value="owner-defined-type"/>
                 <xml-property name="container" value="cloud-regions"/>
                 <xml-property name="namespace" value="cloud-infrastructure"/>
                 <xml-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">
@@ -743,6 +750,7 @@
                 <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>
 
@@ -876,6 +884,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>
 
@@ -922,6 +931,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>
 
@@ -972,6 +982,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>
 
@@ -1042,6 +1053,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>
 
@@ -1149,6 +1161,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>
 
@@ -1242,6 +1255,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>
 
@@ -1295,6 +1309,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"/>
             <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>
 
@@ -1385,6 +1400,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>
 
@@ -1438,6 +1454,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"/>
             <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>
 
@@ -1477,6 +1494,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>
 
@@ -1562,6 +1580,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>
 
@@ -1643,6 +1662,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>
 
@@ -1694,6 +1714,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>
 
@@ -1770,6 +1791,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>
 
@@ -1800,6 +1822,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>
 
@@ -1839,6 +1862,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>
 
@@ -1878,6 +1902,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>
 
@@ -2046,6 +2071,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>
 
@@ -2109,7 +2135,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">
@@ -2139,6 +2165,7 @@
                 <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>
 
@@ -2210,6 +2237,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>
 
@@ -2265,6 +2293,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>
 
@@ -2309,6 +2338,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>
 
@@ -2349,6 +2379,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>
 
@@ -2399,6 +2430,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>
 
@@ -2468,6 +2500,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>
 
@@ -2520,6 +2553,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>
 
@@ -2555,6 +2589,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>
 
@@ -2596,6 +2631,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>
 
@@ -2631,6 +2667,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>
 
@@ -2673,6 +2710,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>
 
@@ -2721,17 +2759,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 -->
@@ -2832,6 +2870,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>
 
@@ -2901,6 +2940,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>
 
@@ -2950,6 +2990,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>
 
@@ -2989,6 +3030,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>
 
@@ -3129,6 +3171,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,configuration-sub-type"/>
             </xml-properties>
         </java-type>
 
@@ -3265,6 +3308,7 @@
                 <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>
 
@@ -3301,6 +3345,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>
 
@@ -3512,6 +3557,7 @@
                 <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>
 
@@ -3564,6 +3610,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>
 
@@ -3734,6 +3781,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>
 
@@ -3812,6 +3860,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>
 
@@ -4117,6 +4166,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">
@@ -4312,7 +4362,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">
@@ -4449,17 +4499,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">
@@ -4624,6 +4674,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>
 
@@ -4734,6 +4785,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"/>
             </xml-properties>
         </java-type>
 
@@ -4769,6 +4821,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>
 
@@ -4867,6 +4920,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>
 
@@ -5014,6 +5068,7 @@
                 <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>
 
@@ -5103,6 +5158,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>
 
@@ -5144,6 +5200,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>
 
@@ -5277,6 +5334,7 @@
                 <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-property name="requiredProps" value="ipsec-configuration-id"/>
             </xml-properties>
         </java-type>
 
@@ -5373,6 +5431,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">
@@ -5412,6 +5471,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">
@@ -5466,6 +5526,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>
@@ -5521,6 +5582,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>
@@ -5555,6 +5617,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>
@@ -5587,6 +5650,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>
@@ -5619,6 +5683,7 @@
                 <xml-property name="container" value="named-queries"/>
                 <xml-property name="namespace" value="service-design-and-creation"/>
                 <xml-property name="uriTemplate" value="/service-design-and-creation/named-queries/named-query/{named-query-uuid}"/>
+            <xml-property name="requiredProps" value="named-query-uuid,named-query-name,named-query-version"/>
             </xml-properties>
             <xml-root-element name="named-query"/>
             <java-attributes>
@@ -5651,6 +5716,7 @@
                 <xml-property name="allowDirectWrite" value="false"/>
                 <xml-property name="container" value="named-query-elements"/>
                 <xml-property name="uriTemplate" value="/named-query-elements/named-query-element/{named-query-element-uuid}"/>
+            <xml-property name="requiredProps" value="named-query-element-uuid"/>
             </xml-properties>
             <xml-root-element name="named-query-element"/>
             <java-attributes>
@@ -5686,6 +5752,7 @@
                 <xml-property name="allowDirectWrite" value="false"/>
                 <xml-property name="container" value="related-lookups"/>
                 <xml-property name="uriTemplate" value="/related-lookups/related-lookup/{related-lookup-uuid}"/>
+            <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>
@@ -5720,6 +5787,7 @@
                 <xml-property name="allowDirectWrite" value="false"/>
                 <xml-property name="container" value="property-constraints"/>
                 <xml-property name="uriTemplate" value="/property-constraints/property-constraint/{property-constraint-uuid}"/>
+            <xml-property name="requiredProps" value="property-constraint-uuid,constraint-type,property-name,property-value"/>
             </xml-properties>
             <xml-root-element name="property-constraint"/>
             <java-attributes>
@@ -5764,6 +5832,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">
@@ -5955,6 +6024,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>
 
@@ -6040,6 +6110,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,type"/>
             </xml-properties>
         </java-type>
 
@@ -6075,6 +6146,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>
 
@@ -6168,6 +6240,7 @@
                 <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>
 
@@ -6225,6 +6298,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>
 
@@ -6264,6 +6338,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>
 
@@ -6304,6 +6379,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>
 
@@ -6322,6 +6398,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>
 
@@ -6378,6 +6455,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">
@@ -6415,6 +6493,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>
 
@@ -6448,6 +6527,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>
 
@@ -6545,6 +6625,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>
 
@@ -6598,6 +6679,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>
 
@@ -6662,6 +6744,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>
 
@@ -6682,6 +6765,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">
@@ -6724,6 +6808,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">
@@ -6793,6 +6878,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>
 
@@ -6889,9 +6975,9 @@
                 <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>
 
     </java-types>
 </xml-bindings>
-

diff --git a/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml b/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml
index fb072fc..45a8456 100644 (file)
--- a/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   ============LICENSE_START=======================================================
   org.onap.aai
@@ -18,8 +17,7 @@
   limitations under the License.
   ============LICENSE_END=========================================================
   -->
-
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v13" xml-mapping-metadata-complete="true">
+  <xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v13" xml-mapping-metadata-complete="true">
     <xml-schema element-form-default="QUALIFIED">
         <xml-ns namespace-uri="http://org.onap.aai.inventory/v13"/>
     </xml-schema>
@@ -30,7 +28,7 @@
                 <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v13.Search"/>
                 <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v13.Actions"/>
                 <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v13.CloudInfrastructure"/>
-                               <xml-element java-attribute="externalSystem" name="external-system" type="inventory.aai.onap.org.v13.ExternalSystem" />
+                               <xml-element java-attribute="externalSystem" name="external-system" type="inventory.aai.onap.org.v13.ExternalSystem"/>
                 <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v13.Business"/>
                 <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v13.ServiceDesignAndCreation"/>
                 <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v13.Network"/>
@@ -173,6 +171,7 @@
         <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-property name="requiredProps" value="update-node-type"/>
             </xml-properties>
             <xml-root-element name="update"/>
             <java-attributes>
@@ -228,266 +227,270 @@
 
                <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.v13.EsrEmsList" />
-                               <xml-element java-attribute="esrVnfmList" name="esr-vnfm-list" type="inventory.aai.onap.org.v13.EsrVnfmList" />
-                               <xml-element java-attribute="esrThirdpartySdncList" name="esr-thirdparty-sdnc-list" type="inventory.aai.onap.org.v13.EsrThirdpartySdncList" />
+                               <xml-element java-attribute="esrEmsList" name="esr-ems-list" type="inventory.aai.onap.org.v13.EsrEmsList"/>
+                               <xml-element java-attribute="esrVnfmList" name="esr-vnfm-list" type="inventory.aai.onap.org.v13.EsrVnfmList"/>
+                               <xml-element java-attribute="esrThirdpartySdncList" name="esr-thirdparty-sdnc-list" type="inventory.aai.onap.org.v13.EsrThirdpartySdncList"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="EsrEmsList">
-                       <xml-root-element name="esr-ems-list" />
+                       <xml-root-element name="esr-ems-list"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="esrEms" name="esr-ems" type="inventory.aai.onap.org.v13.EsrEms" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrEms" name="esr-ems" type="inventory.aai.onap.org.v13.EsrEms"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="maximumDepth" value="0" />
+                               <xml-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.v13.EsrSystemInfoList" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v13.EsrSystemInfoList"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Persist EMS address information used by EMS driver." />
-                               <xml-property name="indexedProps" value="ems-id" />
-                               <xml-property name="searchable" value="ems-id" />
-                               <xml-property name="container" value="esr-ems-list" />
-                               <xml-property name="namespace" value="external-system" />
-                       </xml-properties>
+                               <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.v13.EsrVnfm" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrVnfm" name="esr-vnfm" type="inventory.aai.onap.org.v13.EsrVnfm"/>
                        </java-attributes>
             <xml-properties>
-                               <xml-property name="maximumDepth" value="0" />
+                               <xml-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.v13.EsrSystemInfoList" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v13.EsrSystemInfoList"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Persist VNFM address information used by VF-C." />
-                               <xml-property name="indexedProps" value="vnfm-id" />
-                               <xml-property name="searchable" value="vnfm-id" />
-                               <xml-property name="container" value="esr-vnfm-list" />
-                               <xml-property name="namespace" value="external-system" />
-                       </xml-properties>
+                               <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.v13.EsrThirdpartySdnc" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrThirdpartySdnc" name="esr-thirdparty-sdnc" type="inventory.aai.onap.org.v13.EsrThirdpartySdnc"/>
                        </java-attributes>
             <xml-properties>
-                               <xml-property name="maximumDepth" value="0" />
+                               <xml-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.v13.EsrSystemInfoList" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v13.EsrSystemInfoList"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC." />
-                               <xml-property name="indexedProps" value="sdnc-id" />
-                               <xml-property name="searchable" value="sdnc-id" />
-                               <xml-property name="container" value="esr-thirdparty-sdnc-list" />
-                               <xml-property name="namespace" value="external-system" />
-                       </xml-properties>
+                               <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.v13.EsrSystemInfo" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v13.EsrSystemInfo"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="maximumDepth" value="0" />
+                               <xml-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="resourceVersion" name="resource-version" type="java.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.v13.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Persist common address information of external systems." />
-                               <xml-property name="indexedProps" value="esr-system-info-id,system-name,system-type" />
-                               <xml-property name="searchable" value="esr-system-info-id,system-name,system-type" />
-                               <xml-property name="container" value="esr-system-info-list" />
-                               <xml-property name="dependentOn" value="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc" />
-                       </xml-properties>
+                               <xml-property name="description" value="Persist common address information of external systems."/>
+                               <xml-property name="indexedProps" value="esr-system-info-id,system-name,system-type"/>
+                               <xml-property name="searchable" value="esr-system-info-id,system-name,system-type"/>
+                               <xml-property name="container" value="esr-system-info-list"/>
+                               <xml-property name="dependentOn" value="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc"/>
+                       <xml-property name="requiredProps" value="esr-system-info-id,user-name,password,system-type"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="HpaCapabilities">
@@ -536,7 +539,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">
@@ -563,7 +567,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">
@@ -596,7 +601,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">
@@ -641,12 +646,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="cloudEpaCaps" name="cloud-epa-caps" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="MultiVIM will discover and expose EPA capabilities." />
+                                               <xml-property name="description" value="MultiVIM will discover and expose EPA capabilities."/>
                                        </xml-properties>
                                </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
@@ -671,15 +676,16 @@
                                                <xml-property name="description" value="List of cloud-region specific HPA Capabilities"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v13.EsrSystemInfoList" />
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v13.EsrSystemInfoList"/>
             </java-attributes>
             <xml-properties>
-                               <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." />
+                               <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation."/>
                 <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type"/>
                 <xml-property name="nameProps" value="owner-defined-type"/>
                 <xml-property name="container" value="cloud-regions"/>
                 <xml-property name="namespace" value="cloud-infrastructure"/>
                 <xml-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">
@@ -744,6 +750,7 @@
                 <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>
 
@@ -877,6 +884,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>
 
@@ -923,6 +931,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>
 
@@ -973,6 +982,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>
 
@@ -1043,6 +1053,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>
 
@@ -1150,6 +1161,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>
 
@@ -1243,6 +1255,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>
 
@@ -1296,6 +1309,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"/>
             <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>
 
@@ -1386,6 +1400,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>
 
@@ -1439,6 +1454,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"/>
             <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>
 
@@ -1478,6 +1494,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>
 
@@ -1563,6 +1580,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>
 
@@ -1644,6 +1662,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>
 
@@ -1695,6 +1714,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>
 
@@ -1771,6 +1791,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>
 
@@ -1801,6 +1822,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>
 
@@ -1840,6 +1862,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>
 
@@ -1879,6 +1902,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>
 
@@ -2047,6 +2071,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>
 
@@ -2110,7 +2135,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">
@@ -2140,6 +2165,7 @@
                 <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>
 
@@ -2211,6 +2237,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>
 
@@ -2266,6 +2293,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>
 
@@ -2310,6 +2338,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>
 
@@ -2350,6 +2379,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>
 
@@ -2400,6 +2430,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>
 
@@ -2462,6 +2493,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>
 
@@ -2514,6 +2546,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>
 
@@ -2549,6 +2582,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>
 
@@ -2590,6 +2624,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>
 
@@ -2625,6 +2660,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>
 
@@ -2667,6 +2703,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>
 
@@ -2715,17 +2752,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 -->
@@ -2826,6 +2863,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>
 
@@ -2895,6 +2933,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>
 
@@ -2944,6 +2983,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>
 
@@ -2983,6 +3023,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>
 
@@ -3117,6 +3158,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>
 
@@ -3161,7 +3203,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">
@@ -3246,6 +3288,7 @@
                 <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>
 
@@ -3282,6 +3325,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>
 
@@ -3493,6 +3537,7 @@
                 <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>
 
@@ -3545,6 +3590,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>
 
@@ -3715,6 +3761,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>
 
@@ -3793,6 +3840,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>
 
@@ -4092,6 +4140,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">
@@ -4287,7 +4336,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">
@@ -4425,17 +4474,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">
@@ -4600,6 +4649,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>
 
@@ -4716,6 +4766,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>
 
@@ -4751,6 +4802,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>
 
@@ -4849,6 +4901,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>
 
@@ -5013,6 +5066,7 @@
                 <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>
 
@@ -5102,6 +5156,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>
 
@@ -5143,6 +5198,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>
 
@@ -5276,6 +5332,7 @@
                 <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-property name="requiredProps" value="ipsec-configuration-id"/>
             </xml-properties>
         </java-type>
 
@@ -5373,6 +5430,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">
@@ -5412,6 +5470,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">
@@ -5466,6 +5525,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>
@@ -5521,6 +5581,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>
@@ -5555,6 +5616,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>
@@ -5587,6 +5649,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>
@@ -5619,6 +5682,7 @@
                 <xml-property name="container" value="named-queries"/>
                 <xml-property name="namespace" value="service-design-and-creation"/>
                 <xml-property name="uriTemplate" value="/service-design-and-creation/named-queries/named-query/{named-query-uuid}"/>
+            <xml-property name="requiredProps" value="named-query-uuid,named-query-name,named-query-version"/>
             </xml-properties>
             <xml-root-element name="named-query"/>
             <java-attributes>
@@ -5651,6 +5715,7 @@
                 <xml-property name="allowDirectWrite" value="false"/>
                 <xml-property name="container" value="named-query-elements"/>
                 <xml-property name="uriTemplate" value="/named-query-elements/named-query-element/{named-query-element-uuid}"/>
+            <xml-property name="requiredProps" value="named-query-element-uuid"/>
             </xml-properties>
             <xml-root-element name="named-query-element"/>
             <java-attributes>
@@ -5686,6 +5751,7 @@
                 <xml-property name="allowDirectWrite" value="false"/>
                 <xml-property name="container" value="related-lookups"/>
                 <xml-property name="uriTemplate" value="/related-lookups/related-lookup/{related-lookup-uuid}"/>
+            <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>
@@ -5720,6 +5786,7 @@
                 <xml-property name="allowDirectWrite" value="false"/>
                 <xml-property name="container" value="property-constraints"/>
                 <xml-property name="uriTemplate" value="/property-constraints/property-constraint/{property-constraint-uuid}"/>
+            <xml-property name="requiredProps" value="property-constraint-uuid,constraint-type,property-name,property-value"/>
             </xml-properties>
             <xml-root-element name="property-constraint"/>
             <java-attributes>
@@ -5764,6 +5831,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">
@@ -5955,6 +6023,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>
 
@@ -6041,6 +6110,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>
 
@@ -6076,6 +6146,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>
 
@@ -6162,6 +6233,7 @@
                 <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>
 
@@ -6219,6 +6291,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>
 
@@ -6258,6 +6331,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>
 
@@ -6298,6 +6372,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>
 
@@ -6316,6 +6391,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>
 
@@ -6372,6 +6448,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">
@@ -6409,6 +6486,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>
 
@@ -6442,6 +6520,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>
 
@@ -6539,6 +6618,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>
 
@@ -6592,6 +6672,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>
 
@@ -6656,6 +6737,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>
 
@@ -6676,6 +6758,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">
@@ -6718,6 +6801,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">
@@ -6787,6 +6871,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>
 
@@ -6883,6 +6968,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>
 
@@ -6962,6 +7048,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>
 

diff --git a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
index 8b044f7..05decfb 100644 (file)
--- a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   ============LICENSE_START=======================================================
   org.onap.aai
@@ -19,481 +18,485 @@
   limitations under the License.
   ============LICENSE_END=========================================================
   -->
-
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v14" xml-mapping-metadata-complete="true">
+  <xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v14" xml-mapping-metadata-complete="true">
        <xml-schema element-form-default="QUALIFIED">
-               <xml-ns namespace-uri="http://org.onap.aai.inventory/v14" />
+               <xml-ns namespace-uri="http://org.onap.aai.inventory/v14"/>
        </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.v14.Search" />
-                               <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v14.Actions" />
-                               <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v14.CloudInfrastructure" />
-                               <xml-element java-attribute="externalSystem" name="external-system" type="inventory.aai.onap.org.v14.ExternalSystem" />
-                               <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v14.Business" />
-                               <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v14.ServiceDesignAndCreation" />
-                               <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v14.Network" />
-                               <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v14.AaiInternal" />
+                               <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v14.Search"/>
+                               <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v14.Actions"/>
+                               <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v14.CloudInfrastructure"/>
+                               <xml-element java-attribute="externalSystem" name="external-system" type="inventory.aai.onap.org.v14.ExternalSystem"/>
+                               <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v14.Business"/>
+                               <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v14.ServiceDesignAndCreation"/>
+                               <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v14.Network"/>
+                               <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v14.AaiInternal"/>
                                <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v14.Nodes"/>
                        </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.v14.EdgeTagQueryResult" />
-                               <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v14.EdgeTagQueryRequest" />
-                               <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v14.SearchResults" />
-                               <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v14.SdnZoneResponse" />
+                               <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v14.EdgeTagQueryResult"/>
+                               <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v14.EdgeTagQueryRequest"/>
+                               <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v14.SearchResults"/>
+                               <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v14.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.v14.TaggedInventoryItemList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v14.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.v14.InventoryItem" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v14.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.v14.InventoryItemData" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v14.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.v14.InventoryItemData"/>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v14.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.v14.StartNodeFilter" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v14.IncludeNodeFilter" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v14.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.v14.StartNodeFilter"/>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v14.IncludeNodeFilter"/>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v14.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.v14.ResultData" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v14.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.v14.OamNetworks" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v14.AzAndDvsSwitches" />
+                               <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v14.OamNetworks"/>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v14.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.v14.DvsSwitches" />
-                               <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v14.AvailabilityZone" />
+                               <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v14.DvsSwitches"/>
+                               <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v14.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.v14.Update" />
-                               <xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v14.Notify" />
+                               <xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v14.Update"/>
+                               <xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v14.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.v14.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.v14.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.v14.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.v14.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.v14.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.v14.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.v14.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.v14.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.v14.EsrEmsList" />
-                               <xml-element java-attribute="esrVnfmList" name="esr-vnfm-list" type="inventory.aai.onap.org.v14.EsrVnfmList" />
-                               <xml-element java-attribute="esrThirdpartySdncList" name="esr-thirdparty-sdnc-list" type="inventory.aai.onap.org.v14.EsrThirdpartySdncList" />
+                               <xml-element java-attribute="esrEmsList" name="esr-ems-list" type="inventory.aai.onap.org.v14.EsrEmsList"/>
+                               <xml-element java-attribute="esrVnfmList" name="esr-vnfm-list" type="inventory.aai.onap.org.v14.EsrVnfmList"/>
+                               <xml-element java-attribute="esrThirdpartySdncList" name="esr-thirdparty-sdnc-list" type="inventory.aai.onap.org.v14.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.v14.EsrEms" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrEms" name="esr-ems" type="inventory.aai.onap.org.v14.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.v14.EsrSystemInfoList" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v14.EsrSystemInfoList"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.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.v14.EsrVnfm" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrVnfm" name="esr-vnfm" type="inventory.aai.onap.org.v14.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.v14.EsrSystemInfoList" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v14.EsrSystemInfoList"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.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.v14.EsrThirdpartySdnc" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrThirdpartySdnc" name="esr-thirdparty-sdnc" type="inventory.aai.onap.org.v14.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.v14.EsrSystemInfoList" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v14.EsrSystemInfoList"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.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.v14.EsrSystemInfo" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v14.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.v14.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.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">
@@ -542,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">
@@ -569,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">
@@ -603,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">
@@ -648,7 +653,7 @@
                                </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="resourceVersion" name="resource-version" type="java.lang.String">
@@ -673,7 +678,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.v14.EsrSystemInfoList" />
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v14.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."/>
@@ -682,6 +687,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">
@@ -746,66 +752,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.v14.Relationship" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v14.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.v14.RelationshipData" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v14.RelatedToProperty" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v14.RelationshipData"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v14.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>
@@ -878,6 +885,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>
 
@@ -924,6 +932,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>
 
@@ -975,6 +984,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>
 
@@ -1036,6 +1046,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>
 
@@ -1106,6 +1117,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>
 
@@ -1218,6 +1230,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>
 
@@ -1311,6 +1324,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>
 
@@ -1364,6 +1378,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>
 
@@ -1460,6 +1475,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>
 
@@ -1513,6 +1529,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>
 
@@ -1552,6 +1569,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>
 
@@ -1575,7 +1593,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">
@@ -1637,6 +1655,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>
 
@@ -1718,6 +1737,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>
 
@@ -1769,6 +1789,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>
 
@@ -1845,6 +1866,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>
 
@@ -1875,6 +1897,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>
 
@@ -1914,6 +1937,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>
 
@@ -1953,6 +1977,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>
 
@@ -2122,6 +2147,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>
 
@@ -2149,6 +2175,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>
 
@@ -2212,7 +2239,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">
@@ -2233,17 +2260,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.v14.RelationshipList"/>
@@ -2252,11 +2279,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>
 
@@ -2328,6 +2356,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>
 
@@ -2383,6 +2412,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>
 
@@ -2427,6 +2457,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>
 
@@ -2467,6 +2498,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>
 
@@ -2483,7 +2515,7 @@
                 <xml-element java-attribute="platforms" name="platforms" type="inventory.aai.onap.org.v14.Platforms"/>
                 <xml-element java-attribute="projects" name="projects" type="inventory.aai.onap.org.v14.Projects"/>
 
-                               <xml-element java-attribute="spPartners" name="sp-partners" type="inventory.aai.onap.org.v14.SpPartners" />
+                               <xml-element java-attribute="spPartners" name="sp-partners" type="inventory.aai.onap.org.v14.SpPartners"/>
             </java-attributes>
         </java-type>
 
@@ -2519,6 +2551,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>
 
@@ -2581,6 +2614,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>
 
@@ -2633,6 +2667,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>
 
@@ -2668,6 +2703,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>
 
@@ -2709,6 +2745,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>
 
@@ -2744,6 +2781,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>
 
@@ -2786,6 +2824,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>
 
@@ -2834,17 +2873,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 -->
@@ -2914,7 +2953,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.v14.RelationshipList"/>
@@ -2930,6 +2969,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>
 
@@ -2999,6 +3039,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>
 
@@ -3048,6 +3089,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>
 
@@ -3087,6 +3129,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>
 
@@ -3118,14 +3161,14 @@
                 <xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v14.ForwardingPaths"/>
                 <xml-element java-attribute="collections" name="collections" type="inventory.aai.onap.org.v14.Collections"/>
                 <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v14.VlanTags"/>
-                               <xml-element java-attribute="connectivities" name="connectivities" type="inventory.aai.onap.org.v14.Connectivities" />
-                               <xml-element java-attribute="lanPortConfigs" name="lan-port-configs" type="inventory.aai.onap.org.v14.LanPortConfigs" />
-                               <xml-element java-attribute="networkResources" name="network-resources" type="inventory.aai.onap.org.v14.NetworkResources" />
-                               <xml-element java-attribute="siteResources" name="site-resources" type="inventory.aai.onap.org.v14.SiteResources" />
-                               <xml-element java-attribute="sdwanVpns" name="sdwan-vpns" type="inventory.aai.onap.org.v14.SdwanVpns" />
-                               <xml-element java-attribute="devices" name="devices" type="inventory.aai.onap.org.v14.Devices" />
-                               <xml-element java-attribute="wanPortConfigs" name="wan-port-configs" type="inventory.aai.onap.org.v14.WanPortConfigs" />
-                               <xml-element java-attribute="extAaiNetworks" name="ext-aai-networks" type="inventory.aai.onap.org.v14.ExtAaiNetworks" />
+                               <xml-element java-attribute="connectivities" name="connectivities" type="inventory.aai.onap.org.v14.Connectivities"/>
+                               <xml-element java-attribute="lanPortConfigs" name="lan-port-configs" type="inventory.aai.onap.org.v14.LanPortConfigs"/>
+                               <xml-element java-attribute="networkResources" name="network-resources" type="inventory.aai.onap.org.v14.NetworkResources"/>
+                               <xml-element java-attribute="siteResources" name="site-resources" type="inventory.aai.onap.org.v14.SiteResources"/>
+                               <xml-element java-attribute="sdwanVpns" name="sdwan-vpns" type="inventory.aai.onap.org.v14.SdwanVpns"/>
+                               <xml-element java-attribute="devices" name="devices" type="inventory.aai.onap.org.v14.Devices"/>
+                               <xml-element java-attribute="wanPortConfigs" name="wan-port-configs" type="inventory.aai.onap.org.v14.WanPortConfigs"/>
+                               <xml-element java-attribute="extAaiNetworks" name="ext-aai-networks" type="inventory.aai.onap.org.v14.ExtAaiNetworks"/>
             </java-attributes>
         </java-type>
         <java-type name="Configurations">
@@ -3235,6 +3278,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>
 
@@ -3279,7 +3323,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">
@@ -3358,12 +3402,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>
 
@@ -3400,6 +3445,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>
 
@@ -3592,63 +3638,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>
@@ -3667,12 +3713,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>
 
@@ -3725,6 +3772,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>
 
@@ -3895,6 +3943,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>
 
@@ -3973,6 +4022,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>
 
@@ -4284,6 +4334,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">
@@ -4479,7 +4530,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">
@@ -4617,17 +4668,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">
@@ -4792,6 +4843,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>
 
@@ -4908,6 +4960,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>
 
@@ -4943,6 +4996,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>
 
@@ -5041,6 +5095,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>
 
@@ -5178,17 +5233,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">
@@ -5210,15 +5265,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.v14.SoftwareVersions" />
+                <xml-element java-attribute="softwareVersions" name="software-versions" type="inventory.aai.onap.org.v14.SoftwareVersions"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
                 <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v14.PInterfaces"/>
                 <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v14.LagInterfaces"/>
@@ -5231,38 +5286,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.v14.SoftwareVersion" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="softwareVersion" name="software-version" type="inventory.aai.onap.org.v14.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>
 
@@ -5352,6 +5409,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>
 
@@ -5393,6 +5451,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>
 
@@ -5526,78 +5585,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.v14.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.v14.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.v14.ReservedPropNames" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v14.EdgePropNames" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v14.ReservedPropNames"/>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v14.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>
 
@@ -5621,6 +5681,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">
@@ -5660,6 +5721,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">
@@ -5714,6 +5776,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>
@@ -5769,6 +5832,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>
@@ -5803,6 +5867,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>
@@ -5835,6 +5900,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>
@@ -5852,155 +5918,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.v14.NamedQuery" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v14.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.v14.NamedQueryElements" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.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.v14.NamedQueryElements"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.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.v14.NamedQueryElement" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v14.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.v14.NamedQueryElements" />
-                               <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v14.RelatedLookups" />
-                               <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v14.PropertyConstraints" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.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.v14.NamedQueryElements"/>
+                               <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v14.RelatedLookups"/>
+                               <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v14.PropertyConstraints"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.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.v14.RelatedLookup" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v14.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.v14.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.v14.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.v14.PropertyConstraint" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v14.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.v14.QueryParameters" />
-                               <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v14.InstanceFilters" />
-                               <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v14.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.v14.QueryParameters"/>
+                               <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v14.InstanceFilters"/>
+                               <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v14.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.v14.NamedQuery" />
-                               <xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v14.OverloadedModel" />
+                               <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v14.NamedQuery"/>
+                               <xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v14.OverloadedModel"/>
                        </java-attributes>
                </java-type>
 
@@ -6008,6 +6078,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">
@@ -6057,106 +6128,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.v14.InstanceFilter" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v14.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.v14.SecondaryFilt" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v14.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.v14.InventoryResponseItems" />
+                               <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v14.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.v14.InventoryResponseItem" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v14.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.v14.ExtraProperties" />
-                               <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v14.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.v14.ExtraProperties"/>
+                               <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v14.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.v14.ExtraProperty" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v14.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>
 
@@ -6199,6 +6270,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>
 
@@ -6285,6 +6357,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>
 
@@ -6320,6 +6393,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>
 
@@ -6395,42 +6469,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.v14.TunnelXconnects"/>
@@ -6439,13 +6513,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>
 
@@ -6483,6 +6558,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>
 
@@ -6522,6 +6598,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>
 
@@ -6562,6 +6639,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>
 
@@ -6580,6 +6658,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>
 
@@ -6636,6 +6715,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">
@@ -6673,6 +6753,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>
 
@@ -6706,6 +6787,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>
 
@@ -6803,6 +6885,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>
 
@@ -6856,6 +6939,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>
 
@@ -6920,6 +7004,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>
 
@@ -6940,6 +7025,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">
@@ -6982,6 +7068,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">
@@ -7052,6 +7139,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>
 
@@ -7102,6 +7190,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>
 
@@ -7198,6 +7287,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>
 
@@ -7277,6 +7367,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>
 
@@ -7318,6 +7409,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>
 
@@ -7412,25 +7504,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">
@@ -7440,167 +7533,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.v14.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.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.v14.SpPartner" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="spPartner" name="sp-partner" type="inventory.aai.onap.org.v14.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>
@@ -7610,79 +7704,80 @@
                                        </xml-properties>
                                </xml-element>
 
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.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.v14.Connectivity" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="connectivity" name="connectivity" type="inventory.aai.onap.org.v14.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">
@@ -7690,85 +7785,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.v14.DhcpServices" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
+                               <xml-element java-attribute="dhcpServices" name="dhcp-services" type="inventory.aai.onap.org.v14.DhcpServices"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.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.v14.LanPortConfig" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="lanPortConfig" name="lan-port-config" type="inventory.aai.onap.org.v14.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">
@@ -7776,55 +7872,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.v14.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.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.v14.DhcpService" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="dhcpService" name="dhcp-service" type="inventory.aai.onap.org.v14.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">
@@ -7835,90 +7932,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.v14.Pnfs" /> -->
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.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.v14.NetworkResource" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="networkResource" name="network-resource" type="inventory.aai.onap.org.v14.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>
@@ -7927,99 +8025,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.v14.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.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.v14.SiteResource" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="siteResource" name="site-resource" type="inventory.aai.onap.org.v14.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.v14.SdwanVpn" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="sdwanVpn" name="sdwan-vpn" type="inventory.aai.onap.org.v14.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>
@@ -8028,115 +8127,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.v14.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.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.v14.Device" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="device" name="device" type="inventory.aai.onap.org.v14.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>
@@ -8145,141 +8245,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.v14.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.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>
@@ -8288,45 +8389,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.v14.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.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.v14.WanPortConfig" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="wanPortConfig" name="wan-port-config" type="inventory.aai.onap.org.v14.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.v14.ExtAaiNetwork" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="extAaiNetwork" name="ext-aai-network" type="inventory.aai.onap.org.v14.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">
@@ -8334,7 +8436,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.v14.EsrSystemInfo" />
+                               <xml-element java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v14.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.v14.LogicalLinks" />
@@ -8348,15 +8450,16 @@
                                <xml-element java-attribute="sdwanVpns" name="sdwan-vpns" type="inventory.aai.onap.org.v14.SdwanVpns" />
                                <xml-element java-attribute="devices" name="devices" type="inventory.aai.onap.org.v14.Devices" />
                                <xml-element java-attribute="wanPortConfigs" name="wan-port-configs" type="inventory.aai.onap.org.v14.WanPortConfigs" /> -->
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.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-types>

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 b010bd0..4d84d7c 100644 (file)
--- 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,7 @@
                                </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="resourceVersion" name="resource-version" type="java.lang.String">
@@ -674,7 +678,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 +687,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 +752,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 +885,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 +932,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 +984,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 +1046,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 +1117,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 +1235,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 +1329,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 +1383,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 +1480,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 +1534,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 +1574,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 +1598,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 +1660,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 +1742,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 +1794,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 +1871,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 +1902,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 +1942,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 +1982,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 +2152,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 +2180,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 +2244,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 +2265,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 +2284,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 +2361,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 +2422,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 +2478,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 +2523,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 +2564,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 +2581,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 +2617,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 +2680,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 +2733,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 +2769,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 +2811,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 +2847,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 +2890,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 +2939,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 +3019,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 +3035,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 +3105,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 +3155,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 +3195,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 +3227,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 +3344,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 +3389,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 +3468,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 +3511,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 +3704,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 +3779,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 +3838,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 +4009,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 +4088,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>
 
@@ -4351,6 +4401,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">
@@ -4546,7 +4597,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">
@@ -4684,17 +4735,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">
@@ -4859,6 +4910,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>
 
@@ -4975,6 +5027,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>
 
@@ -5010,6 +5063,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>
 
@@ -5108,6 +5162,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>
 
@@ -5250,17 +5305,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">
@@ -5282,15 +5337,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"/>
@@ -5304,38 +5359,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>
 
@@ -5425,6 +5482,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>
 
@@ -5466,6 +5524,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>
 
@@ -5599,78 +5658,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>
 
@@ -5694,6 +5754,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">
@@ -5733,6 +5794,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">
@@ -5787,6 +5849,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>
@@ -5842,6 +5905,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>
@@ -5876,6 +5940,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>
@@ -5908,6 +5973,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>
@@ -5925,155 +5991,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>
 
@@ -6081,6 +6151,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">
@@ -6130,106 +6201,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>
 
@@ -6272,6 +6343,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>
 
@@ -6358,6 +6430,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>
 
@@ -6393,6 +6466,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>
 
@@ -6468,42 +6542,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"/>
@@ -6512,13 +6586,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>
 
@@ -6556,6 +6631,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>
 
@@ -6595,6 +6671,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>
 
@@ -6635,6 +6712,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>
 
@@ -6653,6 +6731,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>
 
@@ -6709,6 +6788,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">
@@ -6746,6 +6826,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>
 
@@ -6779,6 +6860,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>
 
@@ -6876,6 +6958,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>
 
@@ -6929,6 +7012,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>
 
@@ -6993,6 +7077,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>
 
@@ -7013,6 +7098,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">
@@ -7055,6 +7141,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">
@@ -7125,6 +7212,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>
 
@@ -7175,6 +7263,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>
 
@@ -7271,6 +7360,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>
 
@@ -7350,6 +7440,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>
 
@@ -7391,6 +7482,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>
 
@@ -7485,25 +7577,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">
@@ -7513,167 +7606,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>
@@ -7683,79 +7777,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">
@@ -7763,85 +7858,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">
@@ -7849,55 +7945,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">
@@ -7908,90 +8005,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>
@@ -8000,99 +8098,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>
@@ -8101,115 +8200,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>
@@ -8218,141 +8318,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>
@@ -8361,45 +8462,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">
@@ -8407,7 +8509,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" />
@@ -8421,15 +8523,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">
@@ -8487,6 +8590,7 @@
                 <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>    
                
@@ -8530,11 +8634,12 @@
                 </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="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>
                        

diff --git a/aai-schema/src/main/resources/onap/oxm/v8/aai_oxm_v8.xml b/aai-schema/src/main/resources/onap/oxm/v8/aai_oxm_v8.xml
index d666b73..cf768a3 100644 (file)
--- a/aai-schema/src/main/resources/onap/oxm/v8/aai_oxm_v8.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v8/aai_oxm_v8.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
 
     ============LICENSE_START=======================================================
@@ -21,402 +20,404 @@
 
     ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
--->
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v8" xml-mapping-metadata-complete="true">
+--><xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v8" xml-mapping-metadata-complete="true">
        <xml-schema element-form-default="QUALIFIED">
-               <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v8" />
+               <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v8"/>
        </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.v8.Search" />
-                               <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v8.Actions" />
-                               <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v8.CloudInfrastructure" />
-                               <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v8.Business" />
-                               <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v8.ServiceDesignAndCreation" />
-                               <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v8.Network" />
-                               <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v8.AaiInternal" />
+                               <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v8.Search"/>
+                               <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v8.Actions"/>
+                               <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v8.CloudInfrastructure"/>
+                               <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v8.Business"/>
+                               <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v8.ServiceDesignAndCreation"/>
+                               <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v8.Network"/>
+                               <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v8.AaiInternal"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Search">
-                       <xml-root-element name="search" />
+                       <xml-root-element name="search"/>
                        <java-attributes>
-                               <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v8.EdgeTagQueryResult" />
-                               <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v8.EdgeTagQueryRequest" />
-                               <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v8.SearchResults" />
-                               <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v8.SdnZoneResponse" />
+                               <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v8.EdgeTagQueryResult"/>
+                               <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v8.EdgeTagQueryRequest"/>
+                               <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v8.SearchResults"/>
+                               <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v8.SdnZoneResponse"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="EdgeTagQueryResult">
-                       <xml-root-element name="edge-tag-query-result" />
+                       <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.v8.TaggedInventoryItemList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v8.TaggedInventoryItemList"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="TaggedInventoryItemList">
-                       <xml-root-element name="tagged-inventory-item-list" />
+                       <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.v8.InventoryItem" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v8.InventoryItem"/>
                        </java-attributes>
                </java-type>
 
                <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.v8.InventoryItemData" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v8.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.v8.InventoryItemData"/>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v8.TaggedInventoryItemList"/>
                        </java-attributes>
                </java-type>
 
                <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.v8.StartNodeFilter" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v8.IncludeNodeFilter" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v8.SecondaryFilter" />
+                               <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.v8.StartNodeFilter"/>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v8.IncludeNodeFilter"/>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v8.SecondaryFilter"/>
                        </java-attributes>
                </java-type>
 
                <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.v8.ResultData" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v8.ResultData"/>
                        </java-attributes>
                </java-type>
 
                <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.v8.OamNetworks" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v8.AzAndDvsSwitches" />
+                               <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v8.OamNetworks"/>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v8.AzAndDvsSwitches"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="AzAndDvsSwitches">
-                       <xml-root-element name="az-and-dvs-switches" />
+                       <xml-root-element name="az-and-dvs-switches"/>
                        <java-attributes>
-                               <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v8.DvsSwitches" />
-                               <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v8.AvailabilityZone" />
+                               <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v8.DvsSwitches"/>
+                               <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v8.AvailabilityZone"/>
                        </java-attributes>
                </java-type>
 
                <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.v8.Update" />
-                               <xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v8.Notify" />
+                               <xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v8.Update"/>
+                               <xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v8.Notify"/>
                        </java-attributes>
                </java-type>
 
                <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.v8.UpdateNodeKey" />
-                               <xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v8.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.v8.UpdateNodeKey"/>
+                               <xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String"/>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v8.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.v8.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.v8.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.v8.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.v8.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="CloudInfrastructure">
                        <xml-properties>
-                               <xml-property name="description" value="Namespace for cloud infrastructure." />
+                               <xml-property name="description" value="Namespace for cloud infrastructure."/>
                        </xml-properties>
-                       <xml-root-element name="cloud-infrastructure" />
+                       <xml-root-element name="cloud-infrastructure"/>
                        <java-attributes>
-                               <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v8.Complexes" />
-                               <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v8.CloudRegions" />
-                               <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v8.NetworkProfiles" />
-                               <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v8.Pservers" />
-                               <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v8.VirtualDataCenters" />
+                               <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v8.Complexes"/>
+                               <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v8.CloudRegions"/>
+                               <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v8.NetworkProfiles"/>
+                               <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v8.Pservers"/>
+                               <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v8.VirtualDataCenters"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="CloudRegions">
-                       <xml-root-element name="cloud-regions" />
+                       <xml-root-element name="cloud-regions"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v8.CloudRegion" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v8.CloudRegion"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="CloudRegion">
-                       <xml-root-element name="cloud-region" />
+                       <xml-root-element name="cloud-region"/>
                        <java-attributes>
                                <xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname" />
+                                               <xml-property name="description" value="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key" />
+                                               <xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="cloudType" name="cloud-type" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Type of the cloud (e.g., openstack)" />
+                                               <xml-property name="description" value="Type of the cloud (e.g., openstack)"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ownerDefinedType" name="owner-defined-type" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Cloud-owner defined type indicator (e.g., DCP, LCP)" />
+                                               <xml-property name="description" value="Cloud-owner defined type indicator (e.g., DCP, LCP)"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="cloudRegionVersion" name="cloud-region-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Software version employed at the site" />
+                                               <xml-property name="description" value="Software version employed at the site"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="URL of the keystone identity service" />
+                                               <xml-property name="description" value="URL of the keystone identity service"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="cloudZone" name="cloud-zone" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Zone where the cloud is homed" />
+                                               <xml-property name="description" value="Zone where the cloud is homed"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="complex name for cloud-region instance" />
+                                               <xml-property name="description" value="complex name for cloud-region 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="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v8.VolumeGroups" />
-                               <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v8.Tenants" />
-                               <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v8.Flavors" />
-                               <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v8.GroupAssignments" />
-                               <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v8.Snapshots" />
-                               <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v8.Images" />
-                               <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v8.DvsSwitches" />
-                               <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v8.OamNetworks" />
-                               <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v8.AvailabilityZones" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v8.VolumeGroups"/>
+                               <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v8.Tenants"/>
+                               <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v8.Flavors"/>
+                               <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v8.GroupAssignments"/>
+                               <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v8.Snapshots"/>
+                               <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v8.Images"/>
+                               <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v8.DvsSwitches"/>
+                               <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v8.OamNetworks"/>
+                               <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v8.AvailabilityZones"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." />
-                               <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type" />
-                               <xml-property name="nameProps" value="owner-defined-type" />
-                               <xml-property name="container" value="cloud-regions" />
-                               <xml-property name="namespace" value="cloud-infrastructure" />
-                       </xml-properties>
+                               <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation."/>
+                               <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type"/>
+                               <xml-property name="nameProps" value="owner-defined-type"/>
+                               <xml-property name="container" value="cloud-regions"/>
+                               <xml-property name="namespace" value="cloud-infrastructure"/>
+                       <xml-property name="requiredProps" value="cloud-owner,cloud-region-id"/>
+            </xml-properties>
                </java-type>
                <java-type name="VolumeGroups">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of persistent block-level storage." />
+                               <xml-property name="description" value="Collection of persistent block-level storage."/>
                        </xml-properties>
-                       <xml-root-element name="volume-groups" />
+                       <xml-root-element name="volume-groups"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v8.VolumeGroup" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v8.VolumeGroup"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="VolumeGroup">
-                       <xml-root-element name="volume-group" />
+                       <xml-root-element name="volume-group"/>
                        <java-attributes>
                                <xml-element java-attribute="volumeGroupId" name="volume-group-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique ID of volume-group." />
+                                               <xml-property name="description" value="Unique ID of volume-group."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="volumeGroupName" name="volume-group-name" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Name of the volume group." />
+                                               <xml-property name="description" value="Name of the volume group."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Heat stack id corresponding to this volume-group" />
+                                               <xml-property name="description" value="Heat stack id corresponding to this volume-group"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures." />
+                                               <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Orchestration status of this volume-group" />
+                                               <xml-property name="description" value="Orchestration status of this volume-group"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Persistent block-level storage." />
-                               <xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id" />
-                               <xml-property name="dependentOn" value="cloud-region" />
-                               <xml-property name="container" value="volume-groups" />
-                       </xml-properties>
+                               <xml-property name="description" value="Persistent block-level storage."/>
+                               <xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id"/>
+                               <xml-property name="dependentOn" value="cloud-region"/>
+                               <xml-property name="container" value="volume-groups"/>
+                       <xml-property name="requiredProps" value="volume-group-id,volume-group-name,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.v8.Relationship" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v8.Relationship"/>
                        </java-attributes>
                </java-type>
 
                <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="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.v8.RelationshipData" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v8.RelatedToProperty" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v8.RelationshipData"/>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v8.RelatedToProperty"/>
                        </java-attributes>
                </java-type>
 
                <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>
@@ -424,1349 +425,1372 @@
 
                <java-type name="Complexes">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
+                               <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
                        </xml-properties>
-                       <xml-root-element name="complexes" />
+                       <xml-root-element name="complexes"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v8.Complex" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v8.Complex"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Complex">
-                       <xml-root-element name="complex" />
+                       <xml-root-element name="complex"/>
                        <java-attributes>
                                <xml-element java-attribute="physicalLocationId" name="physical-location-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique identifier for physical location, e.g., CLLI" />
+                                               <xml-property name="description" value="Unique identifier for physical location, e.g., CLLI"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="dataCenterCode" name="data-center-code" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Data center code which can be an alternate way to identify a complex" />
+                                               <xml-property name="description" value="Data center code which can be an alternate way to identify a complex"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Gamma complex name for LCP instance." />
+                                               <xml-property name="description" value="Gamma complex name for LCP instance."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="URL of the keystone identity service" />
+                                               <xml-property name="description" value="URL of the keystone identity service"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="physicalLocationType" name="physical-location-type" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Type, e.g., central office, data center." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String" />
-                               <xml-element java-attribute="street2" name="street2" type="java.lang.String" />
-                               <xml-element java-attribute="city" name="city" required="true" type="java.lang.String" />
-                               <xml-element java-attribute="state" name="state" type="java.lang.String" />
-                               <xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String" />
-                               <xml-element java-attribute="country" name="country" required="true" type="java.lang.String" />
-                               <xml-element java-attribute="region" name="region" required="true" type="java.lang.String" />
-                               <xml-element java-attribute="latitude" name="latitude" type="java.lang.String" />
-                               <xml-element java-attribute="longitude" name="longitude" type="java.lang.String" />
-                               <xml-element java-attribute="elevation" name="elevation" type="java.lang.String" />
-                               <xml-element java-attribute="lata" name="lata" type="java.lang.String" />
-                               <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v8.CtagPools" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
-                               <xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id" />
-                               <xml-property name="searchable" value="physical-location-id,data-center-code,complex-name,street1,street2,postal-code" />
-                               <xml-property name="uniqueProps" value="physical-location-id" />
-                               <xml-property name="container" value="complexes" />
-                               <xml-property name="namespace" value="cloud-infrastructure" />
-                       </xml-properties>
+                                               <xml-property name="description" value="Type, e.g., central office, data center."/>
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String"/>
+                               <xml-element java-attribute="street2" name="street2" type="java.lang.String"/>
+                               <xml-element java-attribute="city" name="city" required="true" type="java.lang.String"/>
+                               <xml-element java-attribute="state" name="state" type="java.lang.String"/>
+                               <xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String"/>
+                               <xml-element java-attribute="country" name="country" required="true" type="java.lang.String"/>
+                               <xml-element java-attribute="region" name="region" required="true" type="java.lang.String"/>
+                               <xml-element java-attribute="latitude" name="latitude" type="java.lang.String"/>
+                               <xml-element java-attribute="longitude" name="longitude" type="java.lang.String"/>
+                               <xml-element java-attribute="elevation" name="elevation" type="java.lang.String"/>
+                               <xml-element java-attribute="lata" name="lata" type="java.lang.String"/>
+                               <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v8.CtagPools"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
+                               <xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id"/>
+                               <xml-property name="searchable" value="physical-location-id,data-center-code,complex-name,street1,street2,postal-code"/>
+                               <xml-property name="uniqueProps" value="physical-location-id"/>
+                               <xml-property name="container" value="complexes"/>
+                               <xml-property name="namespace" value="cloud-infrastructure"/>
+                       <xml-property name="requiredProps" value="physical-location-id,physical-location-type,street1,city,postal-code,country,region"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="CtagPools">
-                       <xml-root-element name="ctag-pools" />
+                       <xml-root-element name="ctag-pools"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v8.CtagPool" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v8.CtagPool"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="CtagPool">
-                       <xml-root-element name="ctag-pool" />
+                       <xml-root-element name="ctag-pool"/>
                        <java-attributes>
                                <xml-element java-attribute="targetPe" name="target-pe" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="The Target provider edge router" />
+                                               <xml-property name="description" value="The Target provider edge router"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Name of the availability zone" />
+                                               <xml-property name="description" value="Name of the availability zone"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ctagPoolPurpose" name="ctag-pool-purpose" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Describes what the intended purpose of this pool is." />
+                                               <xml-property name="description" value="Describes what the intended purpose of this pool is."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ctagValues" name="ctag-values" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Comma separated list of ctags" />
+                                               <xml-property name="description" value="Comma separated list of ctags"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose." />
-                               <xml-property name="indexedProps" value="availability-zone-name" />
-                               <xml-property name="dependentOn" value="complex" />
-                               <xml-property name="container" value="ctag-pools" />
-                       </xml-properties>
+                               <xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose."/>
+                               <xml-property name="indexedProps" value="availability-zone-name"/>
+                               <xml-property name="dependentOn" value="complex"/>
+                               <xml-property name="container" value="ctag-pools"/>
+                       <xml-property name="requiredProps" value="target-pe,availability-zone-name,ctag-pool-purpose"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="Tenants">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of openstack tenants." />
+                               <xml-property name="description" value="Collection of openstack tenants."/>
                        </xml-properties>
-                       <xml-root-element name="tenants" />
+                       <xml-root-element name="tenants"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v8.Tenant" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v8.Tenant"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Tenant">
-                       <xml-root-element name="tenant" />
+                       <xml-root-element name="tenant"/>
                        <java-attributes>
                                <xml-element java-attribute="tenantId" name="tenant-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique id relative to the cloud-region." />
+                                               <xml-property name="description" value="Unique id relative to the cloud-region."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="tenantName" name="tenant-name" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Readable name of tenant" />
+                                               <xml-property name="description" value="Readable name of tenant"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v8.Vservers" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v8.Vservers"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Openstack tenant" />
-                               <xml-property name="nameProps" value="tenant-name" />
-                               <xml-property name="indexedProps" value="tenant-name,tenant-id" />
-                               <xml-property name="dependentOn" value="cloud-region" />
-                               <xml-property name="container" value="tenants" />
-                       </xml-properties>
+                               <xml-property name="description" value="Openstack tenant"/>
+                               <xml-property name="nameProps" value="tenant-name"/>
+                               <xml-property name="indexedProps" value="tenant-name,tenant-id"/>
+                               <xml-property name="dependentOn" value="cloud-region"/>
+                               <xml-property name="container" value="tenants"/>
+                       <xml-property name="requiredProps" value="tenant-id,tenant-name"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="Vservers">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs." />
+                               <xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs."/>
                        </xml-properties>
-                       <xml-root-element name="vservers" />
+                       <xml-root-element name="vservers"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v8.Vserver" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v8.Vserver"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Vserver">
-                       <xml-root-element name="vserver" />
+                       <xml-root-element name="vserver"/>
                        <java-attributes>
                                <xml-element java-attribute="vserverId" name="vserver-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique identifier for this vserver relative to its tenant" />
+                                               <xml-property name="description" value="Unique identifier for this vserver relative to its tenant"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vserverName" name="vserver-name" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Name of vserver" />
+                                               <xml-property name="description" value="Name of vserver"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vserverName2" name="vserver-name2" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Alternative name of vserver" />
+                                               <xml-property name="description" value="Alternative name of vserver"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                                               <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vserverSelflink" name="vserver-selflink" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                                               <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                               <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
                                        <xml-properties>
                                                <xml-property name="defaultValue" value="false"/>
-                                               <xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                                               <xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean">
+                               <xml-element default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" type="java.lang.Boolean">
                                        <xml-properties>
                                                <xml-property name="defaultValue" value="false"/>
-                                               <xml-property name="description" value="Used to indicate whether closed loop function is enabled on this node" />
+                                               <xml-property name="description" value="Used to indicate whether closed loop function is enabled on this node"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v8.Volumes" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
-                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v8.LInterfaces" />
+                               <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v8.Volumes"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v8.LInterfaces"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Virtual Servers, aka virtual machine or VM." />
-                               <xml-property name="nameProps" value="vserver-name" />
-                               <xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2" />
-                               <xml-property name="searchable" value="vserver-name,vserver-id,vserver-name2" />
-                               <xml-property name="dependentOn" value="tenant" />
-                               <xml-property name="container" value="vservers" />
-                       </xml-properties>
+                               <xml-property name="description" value="Virtual Servers, aka virtual machine or VM."/>
+                               <xml-property name="nameProps" value="vserver-name"/>
+                               <xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2"/>
+                               <xml-property name="searchable" value="vserver-name,vserver-id,vserver-name2"/>
+                               <xml-property name="dependentOn" value="tenant"/>
+                               <xml-property name="container" value="vservers"/>
+                       <xml-property name="requiredProps" value="vserver-id,vserver-name,vserver-selflink,in-maint,is-closed-loop-disabled"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="LInterfaces">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of logical interfaces." />
+                               <xml-property name="description" value="Collection of logical interfaces."/>
                        </xml-properties>
-                       <xml-root-element name="l-interfaces" />
+                       <xml-root-element name="l-interfaces"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v8.LInterface" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v8.LInterface"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="LInterface">
-                       <xml-root-element name="l-interface" />
+                       <xml-root-element name="l-interface"/>
                        <java-attributes>
                                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Name given to the interface" />
+                                               <xml-property name="description" value="Name given to the interface"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc." />
+                                               <xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B." />
+                                               <xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                                               <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="ID of interface" />
+                                               <xml-property name="description" value="ID of interface"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="MAC address for the interface" />
+                                               <xml-property name="description" value="MAC address for the interface"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Name of the network" />
+                                               <xml-property name="description" value="Name of the network"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Whether A&amp;AI should be managing this interface of not. Could have value like CUSTOMER" />
+                                               <xml-property name="description" value="Whether A&amp;AI should be managing this interface of not. Could have value like CUSTOMER"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.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="vlans" name="vlans" type="inventory.aai.onap.org.v8.Vlans" />
-                               <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v8.SriovVfs" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v8.L3InterfaceIpv4AddressList" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v8.L3InterfaceIpv6AddressList" />
+                               <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v8.Vlans"/>
+                               <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v8.SriovVfs"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v8.L3InterfaceIpv4AddressList"/>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v8.L3InterfaceIpv6AddressList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Logical interfaces, e.g., a vnic." />
-                               <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name" />
-                               <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface" />
-                               <xml-property name="container" value="l-interfaces" />
-                       </xml-properties>
+                               <xml-property name="description" value="Logical interfaces, e.g., a vnic."/>
+                               <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name"/>
+                               <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface"/>
+                               <xml-property name="container" value="l-interfaces"/>
+                       <xml-property name="requiredProps" value="interface-name"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="SriovVfs">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of SR-IOV Virtual Functions." />
+                               <xml-property name="description" value="Collection of SR-IOV Virtual Functions."/>
                        </xml-properties>
-                       <xml-root-element name="sriov-vfs" />
+                       <xml-root-element name="sriov-vfs"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v8.SriovVf" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v8.SriovVf"/>
                        </java-attributes>
                </java-type>
                <java-type name="SriovVf">
-                       <xml-root-element name="sriov-vf" />
+                       <xml-root-element name="sriov-vf"/>
                        <java-attributes>
                                <xml-element java-attribute="pciId" name="pci-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="PCI ID used to identify the sriov-vf" />
+                                               <xml-property name="description" value="PCI ID used to identify the sriov-vf"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vfVlanFilter" name="vf-vlan-filter" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM." />
+                                               <xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vfMacFilter" name="vf-mac-filter" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM." />
+                                               <xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vfVlanStrip" name="vf-vlan-strip" type="java.lang.Boolean">
                                        <xml-properties>
-                                               <xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM." />
+                                               <xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vfVlanAntiSpoofCheck" name="vf-vlan-anti-spoof-check" type="java.lang.Boolean">
                                        <xml-properties>
-                                               <xml-property name="description" value="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs." />
+                                               <xml-property name="description" value="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vfMacAntiSpoofCheck" name="vf-mac-anti-spoof-check" type="java.lang.Boolean">
                                        <xml-properties>
-                                               <xml-property name="description" value="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs." />
+                                               <xml-property name="description" value="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vfMirrors" name="vf-mirrors" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports." />
+                                               <xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vfBroadcastAllow" name="vf-broadcast-allow" type="java.lang.Boolean">
                                        <xml-properties>
-                                               <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM" />
+                                               <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vfUnknownMulticastAllow" name="vf-unknown-multicast-allow" type="java.lang.Boolean">
                                        <xml-properties>
-                                               <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM" />
+                                               <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vfUnknownUnicastAllow" name="vf-unknown-unicast-allow" type="java.lang.Boolean">
                                        <xml-properties>
-                                               <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM" />
+                                               <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vfInsertStag" name="vf-insert-stag" type="java.lang.Boolean">
                                        <xml-properties>
-                                               <xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM." />
+                                               <xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vfLinkStatus" name="vf-link-status" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto." />
+                                               <xml-property name="description" value="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Neutron network id of the interface" />
+                                               <xml-property name="description" value="Neutron network id of the interface"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)" />
-                               <xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id" />
-                               <xml-property name="dependentOn" value="l-interface" />
-                               <xml-property name="container" value="sriov-vfs" />
-                       </xml-properties>
+                               <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)"/>
+                               <xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id"/>
+                               <xml-property name="dependentOn" value="l-interface"/>
+                               <xml-property name="container" value="sriov-vfs"/>
+                       <xml-property name="requiredProps" value="pci-id"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="L3InterfaceIpv4AddressList">
-                       <xml-root-element name="l3-interface-ipv4-address-list" />
+                       <xml-root-element name="l3-interface-ipv4-address-list"/>
                        <java-attributes>
                                <xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="IP address" />
+                                               <xml-property name="description" value="IP address"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long">
                                        <xml-properties>
-                                               <xml-property name="description" value="Prefix length, 32 for single address" />
+                                               <xml-property name="description" value="Prefix length, 32 for single address"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
                                        <xml-properties>
-                                               <xml-property name="description" value="Inner VLAN tag" />
+                                               <xml-property name="description" value="Inner VLAN tag"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
                                        <xml-properties>
-                                               <xml-property name="description" value="Outer VLAN tag" />
+                                               <xml-property name="description" value="Outer VLAN tag"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
                                        <xml-properties>
-                                               <xml-property name="description" value="Indicator of fixed or floating address" />
+                                               <xml-property name="description" value="Indicator of fixed or floating address"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Neutron network id of the interface that address belongs to" />
+                                               <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Neutron id of subnet that address belongs to" />
+                                               <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="IPv4 Address Range" />
-                               <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-                               <xml-property name="dependentOn" value="vlan,l-interface" />
-                       </xml-properties>
+                               <xml-property name="description" value="IPv4 Address Range"/>
+                               <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                               <xml-property name="dependentOn" value="vlan,l-interface"/>
+                       <xml-property name="requiredProps" value="l3-interface-ipv4-address"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="Vlans">
-                       <xml-root-element name="vlans" />
+                       <xml-root-element name="vlans"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v8.Vlan" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v8.Vlan"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Vlan">
-                       <xml-root-element name="vlan" />
+                       <xml-root-element name="vlan"/>
                        <java-attributes>
                                <xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="String that identifies the interface" />
+                                               <xml-property name="description" value="String that identifies the interface"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
                                        <xml-properties>
-                                               <xml-property name="description" value="Inner VLAN tag" />
+                                               <xml-property name="description" value="Inner VLAN tag"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
                                        <xml-properties>
-                                               <xml-property name="description" value="Outer VLAN tag" />
+                                               <xml-property name="description" value="Outer VLAN tag"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Captures the numeric part of the speed" />
+                                               <xml-property name="description" value="Captures the numeric part of the speed"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Captures the units corresponding to the speed" />
+                                               <xml-property name="description" value="Captures the units corresponding to the speed"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vlanDescription" name="vlan-description" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used to describe (the service associated with) the vlan" />
+                                               <xml-property name="description" value="Used to describe (the service associated with) the vlan"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="backdoorConnection" name="backdoor-connection" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Whether customer is going to use this VLAN for backdoor connection to another customer premise device." />
+                                               <xml-property name="description" value="Whether customer is going to use this VLAN for backdoor connection to another customer premise device."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vpnId" name="vpn-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan" />
-                                               <xml-property name="dbAlias" value="vpn-id-local" />
+                                               <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan"/>
+                                               <xml-property name="dbAlias" value="vpn-id-local"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v8.L3InterfaceIpv4AddressList" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v8.L3InterfaceIpv6AddressList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v8.L3InterfaceIpv4AddressList"/>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v8.L3InterfaceIpv6AddressList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Definition of vlan" />
-                               <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-id" />
-                               <xml-property name="uniqueProps" value="vpn-id" />
-                               <xml-property name="dependentOn" value="l-interface" />
-                               <xml-property name="container" value="vlans" />
-                       </xml-properties>
+                               <xml-property name="description" value="Definition of vlan"/>
+                               <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-id"/>
+                               <xml-property name="uniqueProps" value="vpn-id"/>
+                               <xml-property name="dependentOn" value="l-interface"/>
+                               <xml-property name="container" value="vlans"/>
+                       <xml-property name="requiredProps" value="vlan-interface"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="L3InterfaceIpv6AddressList">
-                       <xml-root-element name="l3-interface-ipv6-address-list" />
+                       <xml-root-element name="l3-interface-ipv6-address-list"/>
                        <java-attributes>
                                <xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="IP address" />
+                                               <xml-property name="description" value="IP address"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long">
                                        <xml-properties>
-                                               <xml-property name="description" value="Prefix length, 128 for single address" />
+                                               <xml-property name="description" value="Prefix length, 128 for single address"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
                                        <xml-properties>
-                                               <xml-property name="description" value="Inner VLAN tag" />
+                                               <xml-property name="description" value="Inner VLAN tag"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
                                        <xml-properties>
-                                               <xml-property name="description" value="Outer VLAN tag" />
+                                               <xml-property name="description" value="Outer VLAN tag"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
                                        <xml-properties>
-                                               <xml-property name="description" value="Indicator of fixed or floating address" />
+                                               <xml-property name="description" value="Indicator of fixed or floating address"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Neutron network id of the interface that address belongs to" />
+                                               <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Neutron id of subnet that address belongs to" />
+                                               <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="IPv6 Address Range" />
-                               <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-                               <xml-property name="dependentOn" value="vlan,l-interface" />
-                       </xml-properties>
+                               <xml-property name="description" value="IPv6 Address Range"/>
+                               <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                               <xml-property name="dependentOn" value="vlan,l-interface"/>
+                       <xml-property name="requiredProps" value="l3-interface-ipv6-address"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="Volumes">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of ephemeral Block storage volumes." />
+                               <xml-property name="description" value="Collection of ephemeral Block storage volumes."/>
                        </xml-properties>
-                       <xml-root-element name="volumes" />
+                       <xml-root-element name="volumes"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v8.Volume" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v8.Volume"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Volume">
-                       <xml-root-element name="volume" />
+                       <xml-root-element name="volume"/>
                        <java-attributes>
                                <xml-element java-attribute="volumeId" name="volume-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique ID of block storage volume relative to the vserver." />
+                                               <xml-property name="description" value="Unique ID of block storage volume relative to the vserver."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="volumeSelflink" name="volume-selflink" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                                               <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Ephemeral Block storage volume." />
-                               <xml-property name="indexedProps" value="volume-id" />
-                               <xml-property name="dependentOn" value="vserver" />
-                               <xml-property name="container" value="volumes" />
-                       </xml-properties>
+                               <xml-property name="description" value="Ephemeral Block storage volume."/>
+                               <xml-property name="indexedProps" value="volume-id"/>
+                               <xml-property name="dependentOn" value="vserver"/>
+                               <xml-property name="container" value="volumes"/>
+                       <xml-property name="requiredProps" value="volume-id,volume-selflink"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="Flavors">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of openstack flavors." />
+                               <xml-property name="description" value="Collection of openstack flavors."/>
                        </xml-properties>
-                       <xml-root-element name="flavors" />
+                       <xml-root-element name="flavors"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v8.Flavor" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v8.Flavor"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Flavor">
-                       <xml-root-element name="flavor" />
+                       <xml-root-element name="flavor"/>
                        <java-attributes>
                                <xml-element java-attribute="flavorId" name="flavor-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Flavor id, expected to be unique across cloud-region." />
+                                               <xml-property name="description" value="Flavor id, expected to be unique across cloud-region."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Flavor name" />
+                                               <xml-property name="description" value="Flavor name"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer">
                                        <xml-properties>
-                                               <xml-property name="description" value="Number of CPUs" />
+                                               <xml-property name="description" value="Number of CPUs"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="flavorRam" name="flavor-ram" type="java.lang.Integer">
                                        <xml-properties>
-                                               <xml-property name="description" value="Amount of memory" />
+                                               <xml-property name="description" value="Amount of memory"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="flavorDisk" name="flavor-disk" type="java.lang.Integer">
                                        <xml-properties>
-                                               <xml-property name="description" value="Disk space" />
+                                               <xml-property name="description" value="Disk space"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="flavorEphemeral" name="flavor-ephemeral" type="java.lang.Integer">
                                        <xml-properties>
-                                               <xml-property name="description" value="Amount of ephemeral disk space" />
+                                               <xml-property name="description" value="Amount of ephemeral disk space"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="flavorSwap" name="flavor-swap" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="amount of swap space allocation" />
+                                               <xml-property name="description" value="amount of swap space allocation"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="flavorIsPublic" name="flavor-is-public" type="java.lang.Boolean">
                                        <xml-properties>
-                                               <xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in." />
+                                               <xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="flavorSelflink" name="flavor-selflink" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                                               <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="flavorDisabled" name="flavor-disabled" type="java.lang.Boolean">
                                        <xml-properties>
-                                               <xml-property name="description" value="Boolean as to whether this flavor is no longer enabled" />
+                                               <xml-property name="description" value="Boolean as to whether this flavor is no longer enabled"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Openstack flavor." />
-                               <xml-property name="nameProps" value="flavor-name" />
-                               <xml-property name="indexedProps" value="flavor-name,flavor-id" />
-                               <xml-property name="dependentOn" value="cloud-region" />
-                               <xml-property name="container" value="flavors" />
-                       </xml-properties>
+                               <xml-property name="description" value="Openstack flavor."/>
+                               <xml-property name="nameProps" value="flavor-name"/>
+                               <xml-property name="indexedProps" value="flavor-name,flavor-id"/>
+                               <xml-property name="dependentOn" value="cloud-region"/>
+                               <xml-property name="container" value="flavors"/>
+                       <xml-property name="requiredProps" value="flavor-id,flavor-name,flavor-selflink"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="Snapshots">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of openstack snapshots" />
+                               <xml-property name="description" value="Collection of openstack snapshots"/>
                        </xml-properties>
-                       <xml-root-element name="snapshots" />
+                       <xml-root-element name="snapshots"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v8.Snapshot" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v8.Snapshot"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Snapshot">
-                       <xml-root-element name="snapshot" />
+                       <xml-root-element name="snapshot"/>
                        <java-attributes>
                                <xml-element java-attribute="snapshotId" name="snapshot-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots." />
+                                               <xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="snapshotName" name="snapshot-name" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Snapshot name" />
+                                               <xml-property name="description" value="Snapshot name"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="snapshotArchitecture" name="snapshot-architecture" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Operating system architecture" />
+                                               <xml-property name="description" value="Operating system architecture"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="snapshotOsDistro" name="snapshot-os-distro" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="The common name of the operating system distribution in lowercase" />
+                                               <xml-property name="description" value="The common name of the operating system distribution in lowercase"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="snapshotOsVersion" name="snapshot-os-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="The operating system version as specified by the distributor." />
+                                               <xml-property name="description" value="The operating system version as specified by the distributor."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="application" name="application" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="The application that the image instantiates." />
+                                               <xml-property name="description" value="The application that the image instantiates."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="The vendor of the application." />
+                                               <xml-property name="description" value="The vendor of the application."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="The version of the application." />
+                                               <xml-property name="description" value="The version of the application."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="snapshotSelflink" name="snapshot-selflink" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                                               <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="prevSnapshotId" name="prev-snapshot-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)." />
+                                               <xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Openstack snapshot" />
-                               <xml-property name="nameProps" value="snapshot-name" />
-                               <xml-property name="uniqueProps" value="snapshot-id" />
-                               <xml-property name="indexedProps" value="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id" />
-                               <xml-property name="dependentOn" value="cloud-region" />
-                               <xml-property name="container" value="snapshots" />
-                       </xml-properties>
+                               <xml-property name="description" value="Openstack snapshot"/>
+                               <xml-property name="nameProps" value="snapshot-name"/>
+                               <xml-property name="uniqueProps" value="snapshot-id"/>
+                               <xml-property name="indexedProps" value="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id"/>
+                               <xml-property name="dependentOn" value="cloud-region"/>
+                               <xml-property name="container" value="snapshots"/>
+                       <xml-property name="requiredProps" value="snapshot-id"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="GroupAssignments">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of openstack group assignments" />
+                               <xml-property name="description" value="Collection of openstack group assignments"/>
                        </xml-properties>
-                       <xml-root-element name="group-assignments" />
+                       <xml-root-element name="group-assignments"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v8.GroupAssignment" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v8.GroupAssignment"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="GroupAssignment">
-                       <xml-root-element name="group-assignment" />
+                       <xml-root-element name="group-assignment"/>
                        <java-attributes>
                                <xml-element java-attribute="groupId" name="group-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Group id, expected to be unique across cloud-region." />
+                                               <xml-property name="description" value="Group id, expected to be unique across cloud-region."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="groupType" name="group-type" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Group type - the type of group this instance refers to" />
+                                               <xml-property name="description" value="Group type - the type of group this instance refers to"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="groupName" name="group-name" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Group name - name assigned to the group" />
+                                               <xml-property name="description" value="Group name - name assigned to the group"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="groupDescription" name="group-description" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Group description - description of the group" />
+                                               <xml-property name="description" value="Group description - description of the group"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)." />
-                               <xml-property name="nameProps" value="group-name" />
-                               <xml-property name="indexedProps" value="group-id,group-type,group-name" />
-                               <xml-property name="dependentOn" value="cloud-region" />
-                               <xml-property name="container" value="group-assignments" />
-                       </xml-properties>
+                               <xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)."/>
+                               <xml-property name="nameProps" value="group-name"/>
+                               <xml-property name="indexedProps" value="group-id,group-type,group-name"/>
+                               <xml-property name="dependentOn" value="cloud-region"/>
+                               <xml-property name="container" value="group-assignments"/>
+                       <xml-property name="requiredProps" value="group-id,group-type,group-name"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="Images">
                        <xml-properties>
-                               <xml-property name="description" value="Collectio of Openstack images." />
+                               <xml-property name="description" value="Collectio of Openstack images."/>
                        </xml-properties>
-                       <xml-root-element name="images" />
+                       <xml-root-element name="images"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v8.Image" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v8.Image"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Image">
-                       <xml-root-element name="image" />
+                       <xml-root-element name="image"/>
                        <java-attributes>
                                <xml-element java-attribute="imageId" name="image-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Image id, expected to be unique across cloud region" />
+                                               <xml-property name="description" value="Image id, expected to be unique across cloud region"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="imageName" name="image-name" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Image name" />
+                                               <xml-property name="description" value="Image name"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="imageArchitecture" name="image-architecture" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Operating system architecture." />
+                                               <xml-property name="description" value="Operating system architecture."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="imageOsDistro" name="image-os-distro" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="The common name of the operating system distribution in lowercase" />
+                                               <xml-property name="description" value="The common name of the operating system distribution in lowercase"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="imageOsVersion" name="image-os-version" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="The operating system version as specified by the distributor." />
+                                               <xml-property name="description" value="The operating system version as specified by the distributor."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="application" name="application" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="The application that the image instantiates." />
+                                               <xml-property name="description" value="The application that the image instantiates."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="The vendor of the application." />
+                                               <xml-property name="description" value="The vendor of the application."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="The version of the application." />
+                                               <xml-property name="description" value="The version of the application."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="imageSelflink" name="image-selflink" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                                               <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
-                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v8.Metadata" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v8.Metadata"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Openstack image." />
-                               <xml-property name="nameProps" value="image-name" />
-                               <xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version" />
-                               <xml-property name="dependentOn" value="cloud-region" />
-                               <xml-property name="container" value="images" />
-                       </xml-properties>
+                               <xml-property name="description" value="Openstack image."/>
+                               <xml-property name="nameProps" value="image-name"/>
+                               <xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version"/>
+                               <xml-property name="dependentOn" value="cloud-region"/>
+                               <xml-property name="container" value="images"/>
+                       <xml-property name="requiredProps" value="image-id,image-name,image-os-distro,image-os-version,image-selflink"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="Metadata">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of metadatum (key/value pairs)" />
+                               <xml-property name="description" value="Collection of metadatum (key/value pairs)"/>
                        </xml-properties>
-                       <xml-root-element name="metadata" />
+                       <xml-root-element name="metadata"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v8.Metadatum" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v8.Metadatum"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Metadatum">
-                       <xml-root-element name="metadatum" />
+                       <xml-root-element name="metadatum"/>
                        <java-attributes>
-                               <xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true" />
-                               <xml-element java-attribute="metaval" name="metaval" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true"/>
+                               <xml-element java-attribute="metaval" name="metaval" required="true" type="java.lang.String"/>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Key/value pairs" />
-                               <xml-property name="indexedProps" value="metaname" />
-                               <xml-property name="dependentOn" value="tenant,image,service-instance,connector,model" />
-                               <xml-property name="container" value="metadata" />
-                       </xml-properties>
+                               <xml-property name="description" value="Key/value pairs"/>
+                               <xml-property name="indexedProps" value="metaname"/>
+                               <xml-property name="dependentOn" value="tenant,image,service-instance,connector,model"/>
+                               <xml-property name="container" value="metadata"/>
+                       <xml-property name="requiredProps" value="metaname,metaval"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="DvsSwitches">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs." />
+                               <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs."/>
                        </xml-properties>
-                       <xml-root-element name="dvs-switches" />
+                       <xml-root-element name="dvs-switches"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v8.DvsSwitch" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v8.DvsSwitch"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="DvsSwitch">
-                       <xml-root-element name="dvs-switch" />
+                       <xml-root-element name="dvs-switch"/>
                        <java-attributes>
                                <xml-element java-attribute="switchName" name="switch-name" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="DVS switch name" />
+                                               <xml-property name="description" value="DVS switch name"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vcenterUrl" name="vcenter-url" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="URL used to reach the vcenter" />
+                                               <xml-property name="description" value="URL used to reach the vcenter"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. " />
-                               <xml-property name="indexedProps" value="vcenter-url,switch-name" />
-                               <xml-property name="dependentOn" value="cloud-region" />
-                               <xml-property name="container" value="dvs-switches" />
-                       </xml-properties>
+                               <xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. "/>
+                               <xml-property name="indexedProps" value="vcenter-url,switch-name"/>
+                               <xml-property name="dependentOn" value="cloud-region"/>
+                               <xml-property name="container" value="dvs-switches"/>
+                       <xml-property name="requiredProps" value="switch-name,vcenter-url"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="NetworkProfiles">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of network profiles" />
+                               <xml-property name="description" value="Collection of network profiles"/>
                        </xml-properties>
-                       <xml-root-element name="network-profiles" />
+                       <xml-root-element name="network-profiles"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v8.NetworkProfile" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v8.NetworkProfile"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="NetworkProfile">
-                       <xml-root-element name="network-profile" />
+                       <xml-root-element name="network-profile"/>
                        <java-attributes>
                                <xml-element java-attribute="nmProfileName" name="nm-profile-name" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique name of network profile." />
+                                               <xml-property name="description" value="Unique name of network profile."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="communityString" name="community-string" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Encrypted SNMP community string" />
+                                               <xml-property name="description" value="Encrypted SNMP community string"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Network profile populated by SDN-GP for SNMP" />
-                               <xml-property name="indexedProps" value="nm-profile-name" />
-                               <xml-property name="container" value="network-profiles" />
-                               <xml-property name="namespace" value="cloud-infrastructure" />
-                       </xml-properties>
+                               <xml-property name="description" value="Network profile populated by SDN-GP for SNMP"/>
+                               <xml-property name="indexedProps" value="nm-profile-name"/>
+                               <xml-property name="container" value="network-profiles"/>
+                               <xml-property name="namespace" value="cloud-infrastructure"/>
+                       <xml-property name="requiredProps" value="nm-profile-name"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="Pservers">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of compute hosts." />
+                               <xml-property name="description" value="Collection of compute hosts."/>
                        </xml-properties>
-                       <xml-root-element name="pservers" />
+                       <xml-root-element name="pservers"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v8.Pserver" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v8.Pserver"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Pserver">
-                       <xml-root-element name="pserver" />
+                       <xml-root-element name="pserver"/>
                        <java-attributes>
                                <xml-element java-attribute="hostname" name="hostname" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Value from executing hostname on the compute node." />
+                                               <xml-property name="description" value="Value from executing hostname on the compute node."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="PTNII name" />
+                                               <xml-property name="description" value="PTNII name"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="numberOfCpus" name="number-of-cpus" type="java.lang.Integer">
                                        <xml-properties>
-                                               <xml-property name="description" value="Number of cpus" />
+                                               <xml-property name="description" value="Number of cpus"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="diskInGigabytes" name="disk-in-gigabytes" type="java.lang.Integer">
                                        <xml-properties>
-                                               <xml-property name="description" value="Disk size, in GBs" />
+                                               <xml-property name="description" value="Disk size, in GBs"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ramInMegabytes" name="ram-in-megabytes" type="java.lang.Integer">
                                        <xml-properties>
-                                               <xml-property name="description" value="RAM size, in MBs" />
+                                               <xml-property name="description" value="RAM size, in MBs"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Equipment type.  Source of truth should define valid values." />
+                                               <xml-property name="description" value="Equipment type.  Source of truth should define valid values."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values." />
+                                               <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Equipment model.  Source of truth should define valid values." />
+                                               <xml-property name="description" value="Equipment model.  Source of truth should define valid values."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="fqdn" name="fqdn" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Fully-qualified domain name" />
+                                               <xml-property name="description" value="Fully-qualified domain name"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="pserverSelflink" name="pserver-selflink" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                                               <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device." />
+                                               <xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Serial number, may be queried" />
+                                               <xml-property name="description" value="Serial number, may be queried"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="pserverId" name="pserver-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="ID of Pserver" />
+                                               <xml-property name="description" value="ID of Pserver"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="internetTopology" name="internet-topology" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="internet topology of Pserver" />
+                                               <xml-property name="description" value="internet topology of Pserver"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                               <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
                                        <xml-properties>
                                                <xml-property name="defaultValue" value="false"/>
-                                               <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                                               <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="pserverName2" name="pserver-name2" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="alternative pserver name" />
+                                               <xml-property name="description" value="alternative pserver name"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="purpose of pserver" />
+                                               <xml-property name="description" value="purpose of pserver"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
-                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v8.PInterfaces" />
-                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v8.LagInterfaces" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
+                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v8.PInterfaces"/>
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v8.LagInterfaces"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver." />
-                               <xml-property name="nameProps" value="pserver-name2" />
-                               <xml-property name="indexedProps" value="hostname,in-maint,pserver-id,pserver-name2" />
-                               <xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address" />
-                               <xml-property name="container" value="pservers" />
-                               <xml-property name="namespace" value="cloud-infrastructure" />
-                       </xml-properties>
+                               <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver."/>
+                               <xml-property name="nameProps" value="pserver-name2"/>
+                               <xml-property name="indexedProps" value="hostname,in-maint,pserver-id,pserver-name2"/>
+                               <xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address"/>
+                               <xml-property name="container" value="pservers"/>
+                               <xml-property name="namespace" value="cloud-infrastructure"/>
+                       <xml-property name="requiredProps" value="hostname,in-maint"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="PInterfaces">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of physical interfaces." />
+                               <xml-property name="description" value="Collection of physical interfaces."/>
                        </xml-properties>
-                       <xml-root-element name="p-interfaces" />
+                       <xml-root-element name="p-interfaces"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v8.PInterface" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v8.PInterface"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="PInterface">
-                       <xml-root-element name="p-interface" />
+                       <xml-root-element name="p-interface"/>
                        <java-attributes>
                                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Name that identifies the physical interface" />
+                                               <xml-property name="description" value="Name that identifies the physical interface"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Captures the numeric part of the speed" />
+                                               <xml-property name="description" value="Captures the numeric part of the speed"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Captures the units corresponding to the speed" />
+                                               <xml-property name="description" value="Captures the units corresponding to the speed"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="portDescription" name="port-description" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Nature of the services and connectivity on this port." />
+                                               <xml-property name="description" value="Nature of the services and connectivity on this port."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="equipmentIdentifier" name="equipment-identifier" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="CLEI or other specification for p-interface hardware." />
+                                               <xml-property name="description" value="CLEI or other specification for p-interface hardware."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Role specification for p-interface hardware." />
+                                               <xml-property name="description" value="Role specification for p-interface hardware."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Indicates the physical properties of the interface." />
+                                               <xml-property name="description" value="Indicates the physical properties of the interface."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
-                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v8.LInterfaces" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v8.LInterfaces"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Physical interface (e.g., nic)" />
-                               <xml-property name="indexedProps" value="interface-name" />
-                               <xml-property name="dependentOn" value="vpls-pe,pserver,pnf" />
-                               <xml-property name="container" value="p-interfaces" />
-                       </xml-properties>
+                               <xml-property name="description" value="Physical interface (e.g., nic)"/>
+                               <xml-property name="indexedProps" value="interface-name"/>
+                               <xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/>
+                               <xml-property name="container" value="p-interfaces"/>
+                       <xml-property name="requiredProps" value="interface-name"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="LagInterfaces">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of link aggregate interfaces." />
+                               <xml-property name="description" value="Collection of link aggregate interfaces."/>
                        </xml-properties>
-                       <xml-root-element name="lag-interfaces" />
+                       <xml-root-element name="lag-interfaces"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v8.LagInterface" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v8.LagInterface"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="LagInterface">
-                       <xml-root-element name="lag-interface" />
+                       <xml-root-element name="lag-interface"/>
                        <java-attributes>
                                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Name that identifies the link aggregate interface" />
+                                               <xml-property name="description" value="Name that identifies the link aggregate interface"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Captures the numeric part of the speed" />
+                                               <xml-property name="description" value="Captures the numeric part of the speed"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Captures the units corresponding to the speed" />
+                                               <xml-property name="description" value="Captures the units corresponding to the speed"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
-                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v8.LInterfaces" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v8.LInterfaces"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Link aggregate interface" />
-                               <xml-property name="indexedProps" value="interface-name" />
-                               <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf" />
-                               <xml-property name="container" value="lag-interfaces" />
-                       </xml-properties>
+                               <xml-property name="description" value="Link aggregate interface"/>
+                               <xml-property name="indexedProps" value="interface-name"/>
+                               <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf"/>
+                               <xml-property name="container" value="lag-interfaces"/>
+                       <xml-property name="requiredProps" value="interface-name"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="OamNetworks">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. " />
+                               <xml-property name="description" value="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. "/>
                        </xml-properties>
-                       <xml-root-element name="oam-networks" />
+                       <xml-root-element name="oam-networks"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v8.OamNetwork" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v8.OamNetwork"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="OamNetwork">
-                       <xml-root-element name="oam-network" />
+                       <xml-root-element name="oam-network"/>
                        <java-attributes>
                                <xml-element java-attribute="networkUuid" name="network-uuid" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="UUID of the network. Unique across a cloud-region" />
+                                               <xml-property name="description" value="UUID of the network. Unique across a cloud-region"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Name of the network." />
+                                               <xml-property name="description" value="Name of the network."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long">
                                        <xml-properties>
-                                               <xml-property name="description" value="cvlan-id" />
+                                               <xml-property name="description" value="cvlan-id"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" />
+                                               <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" />
+                                               <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. " />
-                               <xml-property name="nameProps" value="network-name" />
-                               <xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name" />
-                               <xml-property name="dependentOn" value="cloud-region" />
-                               <xml-property name="container" value="oam-networks" />
-                       </xml-properties>
+                               <xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. "/>
+                               <xml-property name="nameProps" value="network-name"/>
+                               <xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name"/>
+                               <xml-property name="dependentOn" value="cloud-region"/>
+                               <xml-property name="container" value="oam-networks"/>
+                       <xml-property name="requiredProps" value="network-uuid,network-name,cvlan-tag"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="AvailabilityZones">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of availability zones" />
+                               <xml-property name="description" value="Collection of availability zones"/>
                        </xml-properties>
-                       <xml-root-element name="availability-zones" />
+                       <xml-root-element name="availability-zones"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v8.AvailabilityZone" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v8.AvailabilityZone"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="AvailabilityZone">
-                       <xml-root-element name="availability-zone" />
+                       <xml-root-element name="availability-zone"/>
                        <java-attributes>
                                <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Name of the availability zone.  Unique across a cloud region" />
+                                               <xml-property name="description" value="Name of the availability zone.  Unique across a cloud region"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="hypervisorType" name="hypervisor-type" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values." />
+                                               <xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values." />
-                                               <xml-property name="dbAlias" value="operational-status" />
+                                               <xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values."/>
+                                               <xml-property name="dbAlias" value="operational-status"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers" />
-                               <xml-property name="indexedProps" value="availability-zone-name" />
-                               <xml-property name="dependentOn" value="cloud-region" />
-                               <xml-property name="container" value="availability-zones" />
-                       </xml-properties>
+                               <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers"/>
+                               <xml-property name="indexedProps" value="availability-zone-name"/>
+                               <xml-property name="dependentOn" value="cloud-region"/>
+                               <xml-property name="container" value="availability-zones"/>
+                       <xml-property name="requiredProps" value="availability-zone-name,hypervisor-type"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="VirtualDataCenters">
                        <xml-properties>
-                               <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
+                               <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context"/>
                        </xml-properties>
-                       <xml-root-element name="virtual-data-centers" />
+                       <xml-root-element name="virtual-data-centers"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v8.VirtualDataCenter" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v8.VirtualDataCenter"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="VirtualDataCenter">
-                       <xml-root-element name="virtual-data-center" />
+                       <xml-root-element name="virtual-data-center"/>
                        <java-attributes>
                                <xml-element java-attribute="vdcId" name="vdc-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique ID of the vdc" />
+                                               <xml-property name="description" value="Unique ID of the vdc"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vdcName" name="vdc-name" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Name of the virtual data center" />
+                                               <xml-property name="description" value="Name of the virtual data center"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
-                               <xml-property name="nameProps" value="vdc-name" />
-                               <xml-property name="indexedProps" value="vdc-name,vdc-id" />
-                               <xml-property name="container" value="virtual-data-centers" />
-                               <xml-property name="namespace" value="cloud-infrastructure" />
-                       </xml-properties>
+                               <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context"/>
+                               <xml-property name="nameProps" value="vdc-name"/>
+                               <xml-property name="indexedProps" value="vdc-name,vdc-id"/>
+                               <xml-property name="container" value="virtual-data-centers"/>
+                               <xml-property name="namespace" value="cloud-infrastructure"/>
+                       <xml-property name="requiredProps" value="vdc-id,vdc-name"/>
+            </xml-properties>
                </java-type>
 
 
@@ -1774,1119 +1798,1132 @@
 
                <java-type name="Business">
                        <xml-properties>
-                               <xml-property name="description" value="Namespace for business related constructs" />
+                               <xml-property name="description" value="Namespace for business related constructs"/>
                        </xml-properties>
-                       <xml-root-element name="business" />
+                       <xml-root-element name="business"/>
                        <java-attributes>
-                               <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v8.Connectors" />
-                               <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v8.Customers" />
+                               <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v8.Connectors"/>
+                               <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v8.Customers"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Connectors">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
+                               <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets"/>
                        </xml-properties>
-                       <xml-root-element name="connectors" />
+                       <xml-root-element name="connectors"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v8.Connector" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v8.Connector"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Connector">
-                       <xml-root-element name="connector" />
+                       <xml-root-element name="connector"/>
                        <java-attributes>
                                <xml-element java-attribute="resourceInstanceId" name="resource-instance-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique id of resource instance." />
+                                               <xml-property name="description" value="Unique id of resource instance."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
-                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
-                                               <xml-property name="requires" value="persona-model-version" />
-                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                                               <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                                               <xml-property name="requires" value="persona-model-version"/>
+                                               <xml-property name="visibility" value="deployment"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                                               <xml-property name="visibility" value="deployment" />
-                                               <xml-property name="requires" value="persona-model-id" />
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                                               <xml-property name="visibility" value="deployment"/>
+                                               <xml-property name="requires" value="persona-model-id"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                                               <xml-property name="visibility" value="internal" />
-                                               <xml-property name="dbAlias" value="model-version-id-local" />
-                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                                               <xml-property name="visibility" value="internal"/>
+                                               <xml-property name="dbAlias" value="model-version-id-local"/>
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                                               <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                                               <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
-                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v8.Metadata" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v8.Metadata"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
-                               <xml-property name="indexedProps" value="resource-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version" />
-                               <xml-property name="container" value="connectors" />
-                               <xml-property name="namespace" value="business" />
-                       </xml-properties>
+                               <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets"/>
+                               <xml-property name="indexedProps" value="resource-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version"/>
+                               <xml-property name="container" value="connectors"/>
+                               <xml-property name="namespace" value="business"/>
+                       <xml-property name="requiredProps" value="resource-instance-id"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="Customers">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information." />
+                               <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/>
                        </xml-properties>
-                       <xml-root-element name="customers" />
+                       <xml-root-element name="customers"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v8.Customer" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v8.Customer"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Customer">
-                       <xml-root-element name="customer" />
+                       <xml-root-element name="customer"/>
                        <java-attributes>
                                <xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer." />
+                                               <xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer." />
+                                               <xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="subscriberType" name="subscriber-type" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers." />
-                                               <xml-property name="defaultValue" value="CUST" />
+                                               <xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers."/>
+                                               <xml-property name="defaultValue" value="CUST"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v8.ServiceSubscriptions" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v8.ServiceSubscriptions"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="customer identifiers to provide linkage back to BSS information." />
-                               <xml-property name="nameProps" value="subscriber-name" />
-                               <xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type" />
-                               <xml-property name="searchable" value="subscriber-name,global-customer-id" />
-                               <xml-property name="uniqueProps" value="global-customer-id" />
-                               <xml-property name="container" value="customers" />
-                               <xml-property name="namespace" value="business" />
-                       </xml-properties>
+                               <xml-property name="description" value="customer identifiers to provide linkage back to BSS information."/>
+                               <xml-property name="nameProps" value="subscriber-name"/>
+                               <xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type"/>
+                               <xml-property name="searchable" value="subscriber-name,global-customer-id"/>
+                               <xml-property name="uniqueProps" value="global-customer-id"/>
+                               <xml-property name="container" value="customers"/>
+                               <xml-property name="namespace" value="business"/>
+                       <xml-property name="requiredProps" value="global-customer-id,subscriber-name,subscriber-type"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="ServiceSubscriptions">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of objects that group service instances." />
+                               <xml-property name="description" value="Collection of objects that group service instances."/>
                        </xml-properties>
-                       <xml-root-element name="service-subscriptions" />
+                       <xml-root-element name="service-subscriptions"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v8.ServiceSubscription" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v8.ServiceSubscription"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="ServiceSubscription">
-                       <xml-root-element name="service-subscription" />
+                       <xml-root-element name="service-subscription"/>
                        <java-attributes>
                                <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP." />
+                                               <xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="This property will be deleted from A&amp;AI in the near future. Only stop gap solution." />
+                                               <xml-property name="description" value="This property will be deleted from A&amp;AI in the near future. Only stop gap solution."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v8.ServiceInstances">
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Object that group service instances." />
-                               <xml-property name="indexedProps" value="service-type" />
-                               <xml-property name="dependentOn" value="customer" />
-                               <xml-property name="container" value="service-subscriptions" />
-                       </xml-properties>
+                               <xml-property name="description" value="Object that group service instances."/>
+                               <xml-property name="indexedProps" value="service-type"/>
+                               <xml-property name="dependentOn" value="customer"/>
+                               <xml-property name="container" value="service-subscriptions"/>
+                       <xml-property name="requiredProps" value="service-type"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="ServiceInstances">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of service instances" />
+                               <xml-property name="description" value="Collection of service instances"/>
                        </xml-properties>
-                       <xml-root-element name="service-instances" />
+                       <xml-root-element name="service-instances"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v8.ServiceInstance" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v8.ServiceInstance"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="ServiceInstance">
-                       <xml-root-element name="service-instance" />
+                       <xml-root-element name="service-instance"/>
                        <java-attributes>
                                <xml-element java-attribute="serviceInstanceId" name="service-instance-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Uniquely identifies this instance of a service" />
+                                               <xml-property name="description" value="Uniquely identifies this instance of a service"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="serviceInstanceName" name="service-instance-name" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="This field will store a name assigned to the service-instance." />
+                                               <xml-property name="description" value="This field will store a name assigned to the service-instance."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
-                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
-                                               <xml-property name="requires" value="persona-model-version" />
-                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                                               <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                                               <xml-property name="requires" value="persona-model-version"/>
+                                               <xml-property name="visibility" value="deployment"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                                               <xml-property name="visibility" value="deployment" />
-                                               <xml-property name="requires" value="persona-model-id" />
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                                               <xml-property name="visibility" value="deployment"/>
+                                               <xml-property name="requires" value="persona-model-id"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                                               <xml-property name="visibility" value="internal" />
-                                               <xml-property name="dbAlias" value="model-version-id-local" />
-                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                                               <xml-property name="visibility" value="internal"/>
+                                               <xml-property name="dbAlias" value="model-version-id-local"/>
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                                               <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                                               <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="bandwidthTotal" name="bandwidth-total" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Indicates the total bandwidth to be used for this service." />
+                                               <xml-property name="description" value="Indicates the total bandwidth to be used for this service."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device." />
+                                               <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device." />
+                                               <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device." />
+                                               <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device." />
+                                               <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vhnPortalUrl" name="vhn-portal-url" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="URL customers will use to access the vHN Portal." />
+                                               <xml-property name="description" value="URL customers will use to access the vHN Portal."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="An identifier that customers assign to the location where this service is being used." />
+                                               <xml-property name="description" value="An identifier that customers assign to the location where this service is being used."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
-                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v8.Metadata" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v8.Metadata"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Instance of a service" />
-                               <xml-property name="indexedProps" value="service-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id" />
-                               <xml-property name="nameProps" value="service-instance-name" />
-                               <xml-property name="searchable" value="service-instance-id" />
-                               <xml-property name="uniqueProps" value="service-instance-id" />
-                               <xml-property name="dependentOn" value="service-subscription" />
-                               <xml-property name="container" value="service-instances" />
-                       </xml-properties>
+                               <xml-property name="description" value="Instance of a service"/>
+                               <xml-property name="indexedProps" value="service-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id"/>
+                               <xml-property name="nameProps" value="service-instance-name"/>
+                               <xml-property name="searchable" value="service-instance-id"/>
+                               <xml-property name="uniqueProps" value="service-instance-id"/>
+                               <xml-property name="dependentOn" value="service-subscription"/>
+                               <xml-property name="container" value="service-instances"/>
+                       <xml-property name="requiredProps" value="service-instance-id"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="ServiceDesignAndCreation">
                        <xml-properties>
-                               <xml-property name="description" value="Namespace for objects managed by ASDC" />
+                               <xml-property name="description" value="Namespace for objects managed by ASDC"/>
                        </xml-properties>
-                       <xml-root-element name="service-design-and-creation" />
+                       <xml-root-element name="service-design-and-creation"/>
                        <java-attributes>
-                               <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v8.VnfImages" />
-                               <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v8.Services" />
-                               <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v8.ServiceCapabilities" />
-                               <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v8.Models" />
-                               <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v8.NamedQueries" />
+                               <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v8.VnfImages"/>
+                               <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v8.Services"/>
+                               <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v8.ServiceCapabilities"/>
+                               <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v8.Models"/>
+                               <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v8.NamedQueries"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="VnfImages">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
+                               <xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge."/>
                        </xml-properties>
-                       <xml-root-element name="vnf-images" />
+                       <xml-root-element name="vnf-images"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v8.VnfImage" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v8.VnfImage"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="VnfImage">
-                       <xml-root-element name="vnf-image" />
+                       <xml-root-element name="vnf-image"/>
                        <java-attributes>
                                <xml-element java-attribute="vnfImageUuid" name="vnf-image-uuid" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique ID of this asset" />
-                                               <xml-property name="dbAlias" value="vnf-image-uuid" />
+                                               <xml-property name="description" value="Unique ID of this asset"/>
+                                               <xml-property name="dbAlias" value="vnf-image-uuid"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="application" name="application" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="The application that the image instantiates." />
+                                               <xml-property name="description" value="The application that the image instantiates."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="applicationVendor" name="application-vendor" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="The vendor of the application." />
+                                               <xml-property name="description" value="The vendor of the application."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="The version of the application." />
+                                               <xml-property name="description" value="The version of the application."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                                               <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
-                               <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version" />
-                               <xml-property name="uniqueProps" value="vnf-image-uuid" />
-                               <xml-property name="container" value="vnf-images" />
-                               <xml-property name="namespace" value="service-design-and-creation" />
-                       </xml-properties>
+                               <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge."/>
+                               <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version"/>
+                               <xml-property name="uniqueProps" value="vnf-image-uuid"/>
+                               <xml-property name="container" value="vnf-images"/>
+                               <xml-property name="namespace" value="service-design-and-creation"/>
+                       <xml-property name="requiredProps" value="vnf-image-uuid,application,application-vendor"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="Services">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC." />
+                               <xml-property name="description" value="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC."/>
                        </xml-properties>
-                       <xml-root-element name="services" />
+                       <xml-root-element name="services"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v8.Service" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v8.Service"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Service">
-                       <xml-root-element name="service" />
+                       <xml-root-element name="service"/>
                        <java-attributes>
                                <xml-element java-attribute="serviceId" name="service-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." />
+                                               <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="serviceDescription" name="service-description" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Description of the service" />
+                                               <xml-property name="description" value="Description of the service"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="serviceSelflink" name="service-selflink" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                                               <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="serviceVersion" name="service-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="service version" />
+                                               <xml-property name="description" value="service version"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC." />
-                               <xml-property name="indexedProps" value="service-description,service-id" />
-                               <xml-property name="container" value="services" />
-                               <xml-property name="namespace" value="service-design-and-creation" />
-                       </xml-properties>
+                               <xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC."/>
+                               <xml-property name="indexedProps" value="service-description,service-id"/>
+                               <xml-property name="container" value="services"/>
+                               <xml-property name="namespace" value="service-design-and-creation"/>
+                       <xml-property name="requiredProps" value="service-id,service-description"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="ServiceCapabilities">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of service capabilities." />
+                               <xml-property name="description" value="Collection of service capabilities."/>
                        </xml-properties>
-                       <xml-root-element name="service-capabilities" />
+                       <xml-root-element name="service-capabilities"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v8.ServiceCapability" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v8.ServiceCapability"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="ServiceCapability">
-                       <xml-root-element name="service-capability" />
+                       <xml-root-element name="service-capability"/>
                        <java-attributes>
                                <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." />
+                                               <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures." />
+                                               <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this." />
-                               <xml-property name="indexedProps" value="service-type,vnf-type" />
-                               <xml-property name="container" value="service-capabilities" />
-                               <xml-property name="namespace" value="service-design-and-creation" />
-                       </xml-properties>
+                               <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this."/>
+                               <xml-property name="indexedProps" value="service-type,vnf-type"/>
+                               <xml-property name="container" value="service-capabilities"/>
+                               <xml-property name="namespace" value="service-design-and-creation"/>
+                       <xml-property name="requiredProps" value="service-type,vnf-type"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="Network">
                        <xml-properties>
-                               <xml-property name="description" value="Namespace for network inventory resources." />
+                               <xml-property name="description" value="Namespace for network inventory resources."/>
                        </xml-properties>
-                       <xml-root-element name="network" />
-                       <java-attributes>
-                               <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v8.LogicalLinks" />
-                               <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v8.SitePairSets" />
-                               <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v8.VpnBindings" />
-                               <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v8.VplsPes" />
-                               <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v8.MulticastConfigurations" />
-                               <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v8.Vces" />
-                               <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v8.Vnfcs" />
-                               <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v8.L3Networks" />
-                               <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v8.NetworkPolicies" />
-                               <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v8.GenericVnfs" />
-                               <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v8.LagLinks" />
-                               <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v8.Newvces" />
-                               <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v8.Pnfs" />
-                               <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v8.PhysicalLinks" />
-                               <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v8.IpsecConfigurations" />
-                               <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v8.RouteTableReferences" />
+                       <xml-root-element name="network"/>
+                       <java-attributes>
+                               <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v8.LogicalLinks"/>
+                               <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v8.SitePairSets"/>
+                               <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v8.VpnBindings"/>
+                               <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v8.VplsPes"/>
+                               <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v8.MulticastConfigurations"/>
+                               <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v8.Vces"/>
+                               <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v8.Vnfcs"/>
+                               <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v8.L3Networks"/>
+                               <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v8.NetworkPolicies"/>
+                               <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v8.GenericVnfs"/>
+                               <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v8.LagLinks"/>
+                               <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v8.Newvces"/>
+                               <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v8.Pnfs"/>
+                               <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v8.PhysicalLinks"/>
+                               <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v8.IpsecConfigurations"/>
+                               <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v8.RouteTableReferences"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="LogicalLinks">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of logical connections" />
+                               <xml-property name="description" value="Collection of logical connections"/>
                        </xml-properties>
-                       <xml-root-element name="logical-links" />
+                       <xml-root-element name="logical-links"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v8.LogicalLink" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v8.LogicalLink"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="LogicalLink">
-                       <xml-root-element name="logical-link" />
+                       <xml-root-element name="logical-link"/>
                        <java-attributes>
                                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ" />
+                                               <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="linkType" name="link-type" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Type of logical link, e.g., evc" />
+                                               <xml-property name="description" value="Type of logical link, e.g., evc"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Captures the numeric part of the speed" />
+                                               <xml-property name="description" value="Captures the numeric part of the speed"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Captures the units corresponding to the speed" />
+                                               <xml-property name="description" value="Captures the units corresponding to the speed"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="v4, v6, or ds for dual stack" />
+                                               <xml-property name="description" value="v4, v6, or ds for dual stack"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="For example, static or BGP" />
+                                               <xml-property name="description" value="For example, static or BGP"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
-                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
-                                               <xml-property name="requires" value="persona-model-version" />
-                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                                               <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                                               <xml-property name="requires" value="persona-model-version"/>
+                                               <xml-property name="visibility" value="deployment"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                                               <xml-property name="visibility" value="deployment" />
-                                               <xml-property name="requires" value="persona-model-id" />
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                                               <xml-property name="visibility" value="deployment"/>
+                                               <xml-property name="requires" value="persona-model-id"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                                               <xml-property name="visibility" value="internal" />
-                                               <xml-property name="dbAlias" value="model-version-id-local" />
-                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                                               <xml-property name="visibility" value="internal"/>
+                                               <xml-property name="dbAlias" value="model-version-id-local"/>
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                                               <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                                               <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Indication of operational status of the logical link." />
+                                               <xml-property name="description" value="Indication of operational status of the logical link."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="linkRole" name="link-role" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Indication of the network use of the logical link." />
+                                               <xml-property name="description" value="Indication of the network use of the logical link."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="linkName2" name="link-name2" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Alias or alternate name (CLCI or D1 name)." />
+                                               <xml-property name="description" value="Alias or alternate name (CLCI or D1 name)."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="linkId" name="link-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="UUID of the logical-link, SDNC generates this." />
+                                               <xml-property name="description" value="UUID of the logical-link, SDNC generates this."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" />
-                               <xml-property name="indexedProps" value="link-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,link-id" />
-                               <xml-property name="uniqueProps" value="link-id" />
-                               <xml-property name="container" value="logical-links" />
-                               <xml-property name="namespace" value="network" />
-                       </xml-properties>
+                               <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points"/>
+                               <xml-property name="indexedProps" value="link-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,link-id"/>
+                               <xml-property name="uniqueProps" value="link-id"/>
+                               <xml-property name="container" value="logical-links"/>
+                               <xml-property name="namespace" value="network"/>
+                       <xml-property name="requiredProps" value="link-name,link-type"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="SitePairSets">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf" />
+                               <xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf"/>
                        </xml-properties>
-                       <xml-root-element name="site-pair-sets" />
+                       <xml-root-element name="site-pair-sets"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v8.SitePairSet" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v8.SitePairSet"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="SitePairSet">
-                       <xml-root-element name="site-pair-set" />
+                       <xml-root-element name="site-pair-set"/>
                        <java-attributes>
                                <xml-element java-attribute="sitePairSetId" name="site-pair-set-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique id of site pair set." />
+                                               <xml-property name="description" value="Unique id of site pair set."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v8.RoutingInstances" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v8.RoutingInstances"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Set of instances for probes used to measure service level agreements" />
-                               <xml-property name="indexedProps" value="site-pair-set-id" />
-                               <xml-property name="uniqueProps" value="site-pair-set-id" />
-                               <xml-property name="container" value="site-pair-sets" />
-                               <xml-property name="namespace" value="network" />
-                       </xml-properties>
+                               <xml-property name="description" value="Set of instances for probes used to measure service level agreements"/>
+                               <xml-property name="indexedProps" value="site-pair-set-id"/>
+                               <xml-property name="uniqueProps" value="site-pair-set-id"/>
+                               <xml-property name="container" value="site-pair-sets"/>
+                               <xml-property name="namespace" value="network"/>
+                       <xml-property name="requiredProps" value="site-pair-set-id"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="RoutingInstances">
                        <xml-properties>
-                               <xml-property name="description" value="set of probes related to generic-vnf routing instance" />
+                               <xml-property name="description" value="set of probes related to generic-vnf routing instance"/>
                        </xml-properties>
-                       <xml-root-element name="routing-instances" />
+                       <xml-root-element name="routing-instances"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v8.RoutingInstance" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v8.RoutingInstance"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="RoutingInstance">
-                       <xml-root-element name="routing-instance" />
+                       <xml-root-element name="routing-instance"/>
                        <java-attributes>
                                <xml-element java-attribute="routingInstanceId" name="routing-instance-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique id of routing instance" />
+                                               <xml-property name="description" value="Unique id of routing instance"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="rpmOwner" name="rpm-owner" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="rpm owner" />
+                                               <xml-property name="description" value="rpm owner"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v8.SitePairs" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v8.SitePairs"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="indexedProps" value="routing-instance-id" />
-                               <xml-property name="uniqueProps" value="routing-instance-id" />
-                               <xml-property name="dependentOn" value="site-pair-set" />
-                               <xml-property name="container" value="routing-instances" />
+                               <xml-property name="indexedProps" value="routing-instance-id"/>
+                               <xml-property name="uniqueProps" value="routing-instance-id"/>
+                               <xml-property name="dependentOn" value="site-pair-set"/>
+                               <xml-property name="container" value="routing-instances"/>
                        </xml-properties>
                </java-type>
 
                <java-type name="SitePairs">
                        <xml-properties>
-                               <xml-property name="description" value="probe within a set" />
+                               <xml-property name="description" value="probe within a set"/>
                        </xml-properties>
-                       <xml-root-element name="site-pairs" />
+                       <xml-root-element name="site-pairs"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v8.SitePair" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v8.SitePair"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="SitePair">
-                       <xml-root-element name="site-pair" />
+                       <xml-root-element name="site-pair"/>
                        <java-attributes>
                                <xml-element java-attribute="sitePairId" name="site-pair-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="unique identifier of probe" />
+                                               <xml-property name="description" value="unique identifier of probe"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="sourceIp" name="source-ip" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Prefix address" />
+                                               <xml-property name="description" value="Prefix address"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="destinationIp" name="destination-ip" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Prefix address" />
+                                               <xml-property name="description" value="Prefix address"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="ip version, v4, v6" />
+                                               <xml-property name="description" value="ip version, v4, v6"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="destinationHostname" name="destination-hostname" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against." />
+                                               <xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="destinationEquipType" name="destination-equip-type" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="The type of destinatination equipment. Could be Router, etc." />
+                                               <xml-property name="description" value="The type of destinatination equipment. Could be Router, etc."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v8.ClassesOfService" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v8.ClassesOfService"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="indexedProps" value="site-pair-id" />
-                               <xml-property name="uniqueProps" value="site-pair-id" />
-                               <xml-property name="dependentOn" value="routing-instance" />
-                               <xml-property name="container" value="site-pairs" />
+                               <xml-property name="indexedProps" value="site-pair-id"/>
+                               <xml-property name="uniqueProps" value="site-pair-id"/>
+                               <xml-property name="dependentOn" value="routing-instance"/>
+                               <xml-property name="container" value="site-pairs"/>
                        </xml-properties>
                </java-type>
 
                <java-type name="ClassesOfService">
                        <xml-properties>
-                               <xml-property name="description" value="class-of-service of probe" />
+                               <xml-property name="description" value="class-of-service of probe"/>
                        </xml-properties>
-                       <xml-root-element name="classes-of-service" />
+                       <xml-root-element name="classes-of-service"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v8.ClassOfService" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v8.ClassOfService"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="ClassOfService">
-                       <xml-root-element name="class-of-service" />
+                       <xml-root-element name="class-of-service"/>
                        <java-attributes>
                                <xml-element java-attribute="cos" name="cos" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="unique identifier of probe" />
+                                               <xml-property name="description" value="unique identifier of probe"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="probeId" name="probe-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="identifier of probe" />
+                                               <xml-property name="description" value="identifier of probe"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="probeType" name="probe-type" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="type of probe" />
+                                               <xml-property name="description" value="type of probe"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="indexedProps" value="cos" />
-                               <xml-property name="dependentOn" value="site-pair" />
-                               <xml-property name="container" value="classes-of-service" />
+                               <xml-property name="indexedProps" value="cos"/>
+                               <xml-property name="dependentOn" value="site-pair"/>
+                               <xml-property name="container" value="classes-of-service"/>
                        </xml-properties>
                </java-type>
 
                <java-type name="VpnBindings">
-                       <xml-root-element name="vpn-bindings" />
+                       <xml-root-element name="vpn-bindings"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v8.VpnBinding" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v8.VpnBinding"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="VpnBinding">
-                       <xml-root-element name="vpn-binding" />
+                       <xml-root-element name="vpn-binding"/>
                        <java-attributes>
                                <xml-element java-attribute="vpnId" name="vpn-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="VPN ID, globally unique within A&amp;AI" />
+                                               <xml-property name="description" value="VPN ID, globally unique within A&amp;AI"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vpnName" name="vpn-name" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="VPN Name" />
+                                               <xml-property name="description" value="VPN Name"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="globalRouteTarget" name="global-route-target" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Number used to identify a VPN, globally unique in the network" />
+                                               <xml-property name="description" value="Number used to identify a VPN, globally unique in the network"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vpnPlatform" name="vpn-platform" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility" />
+                                               <xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList">
                                        <xml-properties>
-                                               <xml-property name="description" value="l3-networks relate to vpn-bindings" />
+                                               <xml-property name="description" value="l3-networks relate to vpn-bindings"/>
                                        </xml-properties>
                                </xml-element>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="VPN binding" />
-                               <xml-property name="nameProps" value="vpn-name" />
-                               <xml-property name="indexedProps" value="vpn-name,vpn-id,global-route-target" />
-                               <xml-property name="uniqueProps" value="vpn-id" />
-                               <xml-property name="container" value="vpn-bindings" />
-                               <xml-property name="namespace" value="network" />
-                       </xml-properties>
+                               <xml-property name="description" value="VPN binding"/>
+                               <xml-property name="nameProps" value="vpn-name"/>
+                               <xml-property name="indexedProps" value="vpn-name,vpn-id,global-route-target"/>
+                               <xml-property name="uniqueProps" value="vpn-id"/>
+                               <xml-property name="container" value="vpn-bindings"/>
+                               <xml-property name="namespace" value="network"/>
+                       <xml-property name="requiredProps" value="vpn-id,vpn-name,global-route-target"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="VplsPes">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of VPLS Provider Edge routers" />
+                               <xml-property name="description" value="Collection of VPLS Provider Edge routers"/>
                        </xml-properties>
-                       <xml-root-element name="vpls-pes" />
+                       <xml-root-element name="vpls-pes"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v8.VplsPe" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v8.VplsPe"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="VplsPe">
-                       <xml-root-element name="vpls-pe" />
+                       <xml-root-element name="vpls-pe"/>
                        <java-attributes>
-                               <xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true" />
+                               <xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true"/>
                                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
+                                               <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
+                                               <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE." />
+                                               <xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
                                        <xml-properties>
-                                               <xml-property name="description" value="Temporary location for stag to get to VCE" />
+                                               <xml-property name="description" value="Temporary location for stag to get to VCE"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
-                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v8.PInterfaces" />
-                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v8.LagInterfaces" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
+                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v8.PInterfaces"/>
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v8.LagInterfaces"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="VPLS Provider Edge routers." />
-                               <xml-property name="indexedProps" value="prov-status,equipment-name" />
-                               <xml-property name="container" value="vpls-pes" />
-                               <xml-property name="namespace" value="network" />
-                       </xml-properties>
+                               <xml-property name="description" value="VPLS Provider Edge routers."/>
+                               <xml-property name="indexedProps" value="prov-status,equipment-name"/>
+                               <xml-property name="container" value="vpls-pes"/>
+                               <xml-property name="namespace" value="network"/>
+                       <xml-property name="requiredProps" value="equipment-name"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="MulticastConfigurations">
                        <xml-properties>
-                               <xml-property name="description" value="multicast configuration of generic-vnf ip-address" />
+                               <xml-property name="description" value="multicast configuration of generic-vnf ip-address"/>
                        </xml-properties>
-                       <xml-root-element name="multicast-configurations" />
+                       <xml-root-element name="multicast-configurations"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v8.MulticastConfiguration" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v8.MulticastConfiguration"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="MulticastConfiguration">
-                       <xml-root-element name="multicast-configuration" />
+                       <xml-root-element name="multicast-configuration"/>
                        <java-attributes>
                                <xml-element java-attribute="multicastConfigurationId" name="multicast-configuration-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique id of multicast configuration." />
+                                               <xml-property name="description" value="Unique id of multicast configuration."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="multicastProtocol" name="multicast-protocol" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="protocol of multicast configuration" />
+                                               <xml-property name="description" value="protocol of multicast configuration"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="rpType" name="rp-type" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="rp type of multicast configuration" />
+                                               <xml-property name="description" value="rp type of multicast configuration"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="indexedProps" value="multicast-configuration-id" />
-                               <xml-property name="uniqueProps" value="multicast-configuration-id" />
-                               <xml-property name="container" value="multicast-configurations" />
-                               <xml-property name="namespace" value="network" />
+                               <xml-property name="indexedProps" value="multicast-configuration-id"/>
+                               <xml-property name="uniqueProps" value="multicast-configuration-id"/>
+                               <xml-property name="container" value="multicast-configurations"/>
+                               <xml-property name="namespace" value="network"/>
                        </xml-properties>
                </java-type>
 
                <java-type name="Vces">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated." />
+                               <xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated."/>
                        </xml-properties>
-                       <xml-root-element name="vces" />
+                       <xml-root-element name="vces"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v8.Vce" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v8.Vce"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Vce">
-                       <xml-root-element name="vce" />
+                       <xml-root-element name="vce"/>
                        <java-attributes>
                                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
+                                               <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Name of VNF." />
+                                               <xml-property name="description" value="Name of VNF."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Alternate name of VNF." />
+                                               <xml-property name="description" value="Alternate name of VNF."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures." />
+                                               <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique identifier of service from ASDC.  Expect this to change as ASDC matures." />
+                                               <xml-property name="description" value="Unique identifier of service from ASDC.  Expect this to change as ASDC matures."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" />
+                                               <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                                               <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Indicator for whether the resource is considered operational" />
-                                               <xml-property name="dbAlias" value="operational-status" />
+                                               <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                                               <xml-property name="dbAlias" value="operational-status"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="License key" />
+                                               <xml-property name="description" value="License key"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Network role being played by this VNF" />
+                                               <xml-property name="description" value="Network role being played by this VNF"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+                                               <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+                                               <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                                               <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique ID of VPE connected to this VCE." />
+                                               <xml-property name="description" value="Unique ID of VPE connected to this VCE."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64." />
+                                               <xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE." />
+                                               <xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Loopback0 address" />
+                                               <xml-property name="description" value="Loopback0 address"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Entitlement resource uuid" />
+                                               <xml-property name="description" value="Entitlement resource uuid"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v8.PortGroups" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v8.PortGroups"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated." />
-                               <xml-property name="nameProps" value="vnf-name" />
-                               <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id" />
-                               <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" />
-                               <xml-property name="uniqueProps" value="vnf-id" />
-                               <xml-property name="container" value="vces" />
-                               <xml-property name="namespace" value="network" />
-                               <xml-property name="extends" value="vnf" />
-                       </xml-properties>
+                               <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated."/>
+                               <xml-property name="nameProps" value="vnf-name"/>
+                               <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/>
+                               <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
+                               <xml-property name="uniqueProps" value="vnf-id"/>
+                               <xml-property name="container" value="vces"/>
+                               <xml-property name="namespace" value="network"/>
+                               <xml-property name="extends" value="vnf"/>
+                       <xml-property name="requiredProps" value="vnf-id,vnf-name,vnf-type"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="PortGroups">
-                       <xml-root-element name="port-groups" />
+                       <xml-root-element name="port-groups"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v8.PortGroup" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v8.PortGroup"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="PortGroup">
-                       <xml-root-element name="port-group" />
+                       <xml-root-element name="port-group"/>
                        <java-attributes>
                                <xml-element java-attribute="interfaceId" name="interface-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique ID of the interface" />
+                                               <xml-property name="description" value="Unique ID of the interface"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Neutron network id of this Interface" />
+                                               <xml-property name="description" value="Neutron network id of this Interface"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="neutronNetworkName" name="neutron-network-name" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Neutron network name of this Interface" />
+                                               <xml-property name="description" value="Neutron network name of this Interface"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." />
+                                               <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="portGroupId" name="port-group-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique ID for port group in vmware" />
+                                               <xml-property name="description" value="Unique ID for port group in vmware"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="portGroupName" name="port-group-name" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Likely to duplicate value of neutron network name" />
+                                               <xml-property name="description" value="Likely to duplicate value of neutron network name"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="switchName" name="switch-name" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)" />
+                                               <xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+                                               <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+                                               <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                                               <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v8.CvlanTags" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v8.CvlanTags"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Used to capture the network interfaces of this VCE" />
-                               <xml-property name="nameProps" value="port-group-name" />
-                               <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name" />
-                               <xml-property name="dependentOn" value="vce" />
-                               <xml-property name="container" value="port-groups" />
-                       </xml-properties>
+                               <xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
+                               <xml-property name="nameProps" value="port-group-name"/>
+                               <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name"/>
+                               <xml-property name="dependentOn" value="vce"/>
+                               <xml-property name="container" value="port-groups"/>
+                       <xml-property name="requiredProps" value="interface-id,orchestration-status"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="CvlanTags">
-                       <xml-root-element name="cvlan-tags" />
+                       <xml-root-element name="cvlan-tags"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v8.CvlanTagEntry" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v8.CvlanTagEntry"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="CvlanTagEntry">
-                       <xml-root-element name="cvlan-tag-entry" />
+                       <xml-root-element name="cvlan-tag-entry"/>
                        <java-attributes>
                                <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="See mis-na-virtualization-platform.yang" />
+                                               <xml-property name="description" value="See mis-na-virtualization-platform.yang"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="dependentOn" value="port-group" />
-                               <xml-property name="indexedProps" value="cvlan-tag" />
-                               <xml-property name="container" value="cvlan-tags" />
+                               <xml-property name="dependentOn" value="port-group"/>
+                               <xml-property name="indexedProps" value="cvlan-tag"/>
+                               <xml-property name="container" value="cvlan-tags"/>
                        </xml-properties>
                </java-type>
 
@@ -2894,1762 +2931,1783 @@
 
                <java-type name="Vnfcs">
                        <xml-properties>
-                               <xml-property name="description" value="virtual network components associated with a vserver from application controller." />
+                               <xml-property name="description" value="virtual network components associated with a vserver from application controller."/>
                        </xml-properties>
-                       <xml-root-element name="vnfcs" />
+                       <xml-root-element name="vnfcs"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v8.Vnfc" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v8.Vnfc"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Vnfc">
-                       <xml-root-element name="vnfc" />
+                       <xml-root-element name="vnfc"/>
                        <java-attributes>
                                <xml-element java-attribute="vnfcName" name="vnfc-name" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique ID of vnfc." />
+                                               <xml-property name="description" value="Unique ID of vnfc."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vnfcFunctionCode" name="vnfc-function-code" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="function code" />
+                                               <xml-property name="description" value="function code"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vnfcType" name="vnfc-type" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="type" />
+                                               <xml-property name="description" value="type"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="prov status of this vnfc" />
+                                               <xml-property name="description" value="prov status of this vnfc"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Orchestration status of this VNF, mastered by APP-C" />
+                                               <xml-property name="description" value="Orchestration status of this VNF, mastered by APP-C"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Oam V4 vip address of this vnfc" />
+                                               <xml-property name="description" value="Oam V4 vip address of this vnfc"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                               <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
                                        <xml-properties>
                                                <xml-property name="defaultValue" value="false"/>
-                                               <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+                                               <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean">
+                               <xml-element default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" type="java.lang.Boolean">
                                        <xml-properties>
                                                <xml-property name="defaultValue" value="false"/>
-                                               <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node" />
+                                               <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="groupNotation" name="group-notation" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Group notation of VNFC" />
+                                               <xml-property name="description" value="Group notation of VNFC"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" />
-                               <xml-property name="container" value="vnfcs" />
-                               <xml-property name="namespace" value="network" />
+                               <xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation"/>
+                               <xml-property name="container" value="vnfcs"/>
+                               <xml-property name="namespace" value="network"/>
                        </xml-properties>
                </java-type>
 
                <java-type name="L3Networks">
-                       <xml-root-element name="l3-networks" />
+                       <xml-root-element name="l3-networks"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v8.L3Network" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v8.L3Network"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="L3Network">
-                       <xml-root-element name="l3-network" />
+                       <xml-root-element name="l3-network"/>
                        <java-attributes>
                                <xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Network ID, should be uuid. Unique across A&amp;AI." />
+                                               <xml-property name="description" value="Network ID, should be uuid. Unique across A&amp;AI."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Name of the network, governed by some naming convention.." />
+                                               <xml-property name="description" value="Name of the network, governed by some naming convention.."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="networkType" name="network-type" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Type of the network - who defines these values?" />
+                                               <xml-property name="description" value="Type of the network - who defines these values?"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="networkRole" name="network-role" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Role the network plans - who defines these values?" />
+                                               <xml-property name="description" value="Role the network plans - who defines these values?"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="networkTechnology" name="network-technology" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Network technology - who defines these values?" />
+                                               <xml-property name="description" value="Network technology - who defines these values?"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Neutron network id of this Interface" />
+                                               <xml-property name="description" value="Neutron network id of this Interface"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element default-value="false" required="true" java-attribute="isBoundToVpn" name="is-bound-to-vpn" type="java.lang.Boolean">
+                               <xml-element default-value="false" java-attribute="isBoundToVpn" name="is-bound-to-vpn" required="true" type="java.lang.Boolean">
                                        <xml-properties>
                                                <xml-property name="defaultValue" value="false"/>
-                                               <xml-property name="description" value="Set to true if bound to VPN" />
+                                               <xml-property name="description" value="Set to true if bound to VPN"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique identifier of service from ASDC" />
+                                               <xml-property name="description" value="Unique identifier of service from ASDC"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="networkRoleInstance" name="network-role-instance" type="java.lang.Long">
                                        <xml-properties>
-                                               <xml-property name="description" value="network role instance" />
+                                               <xml-property name="description" value="network role instance"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+                                               <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+                                               <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                                               <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="contrailNetworkFqdn" name="contrail-network-fqdn" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Contrail FQDN for the network" />
+                                               <xml-property name="description" value="Contrail FQDN for the network"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
-                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
-                                               <xml-property name="requires" value="persona-model-version" />
-                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                                               <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                                               <xml-property name="requires" value="persona-model-version"/>
+                                               <xml-property name="visibility" value="deployment"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                                               <xml-property name="visibility" value="deployment" />
-                                               <xml-property name="requires" value="persona-model-id" />
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                                               <xml-property name="visibility" value="deployment"/>
+                                               <xml-property name="requires" value="persona-model-id"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                                               <xml-property name="visibility" value="internal" />
-                                               <xml-property name="dbAlias" value="model-version-id-local" />
-                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                                               <xml-property name="visibility" value="internal"/>
+                                               <xml-property name="dbAlias" value="model-version-id-local"/>
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                                               <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                                               <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="physicalNetworkName" name="physical-network-name" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Name associated with the physical network." />
+                                               <xml-property name="description" value="Name associated with the physical network."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="isProviderNetwork" name="is-provider-network" required="true" type="java.lang.Boolean">
                                        <xml-properties>
                                                <xml-property name="defaultValue" value="false"/>
-                                               <xml-property name="description" value="boolean indicatating whether or not network is a provider network." />
+                                               <xml-property name="description" value="boolean indicatating whether or not network is a provider network."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="isSharedNetwork" name="is-shared-network" required="true" type="java.lang.Boolean">
                                        <xml-properties>
                                                <xml-property name="defaultValue" value="false"/>
-                                               <xml-property name="description" value="boolean indicatating whether or not network is a shared network." />
+                                               <xml-property name="description" value="boolean indicatating whether or not network is a shared network."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="isExternalNetwork" name="is-external-network" required="true" type="java.lang.Boolean">
                                        <xml-properties>
                                                <xml-property name="defaultValue" value="false"/>
-                                               <xml-property name="description" value="boolean indicatating whether or not network is an external network." />
+                                               <xml-property name="description" value="boolean indicatating whether or not network is an external network."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v8.Subnets" />
-                               <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v8.CtagAssignments" />
-                               <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v8.SegmentationAssignments" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" >
+                               <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v8.Subnets"/>
+                               <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v8.CtagAssignments"/>
+                               <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v8.SegmentationAssignments"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList">
                                        <xml-properties>
-                                               <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding" />
+                                               <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding"/>
                                        </xml-properties>
                                </xml-element>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Generic network definition" />
-                               <xml-property name="nameProps" value="network-name" />
-                               <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn" />
-                               <xml-property name="uniqueProps" value="network-id" />
-                               <xml-property name="container" value="l3-networks" />
-                               <xml-property name="namespace" value="network" />
-                       </xml-properties>
+                               <xml-property name="description" value="Generic network definition"/>
+                               <xml-property name="nameProps" value="network-name"/>
+                               <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn"/>
+                               <xml-property name="uniqueProps" value="network-id"/>
+                               <xml-property name="container" value="l3-networks"/>
+                               <xml-property name="namespace" value="network"/>
+                       <xml-property name="requiredProps" value="network-id,network-name,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network"/>
+            </xml-properties>
                </java-type>
                <java-type name="NetworkPolicies">
-                       <xml-root-element name="network-policies" />
+                       <xml-root-element name="network-policies"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v8.NetworkPolicy" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v8.NetworkPolicy"/>
                        </java-attributes>
                </java-type>
                <java-type name="NetworkPolicy">
-                       <xml-root-element name="network-policy" />
+                       <xml-root-element name="network-policy"/>
                        <java-attributes>
                                <xml-element java-attribute="networkPolicyId" name="network-policy-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="UUID representing unique key to this instance" />
+                                               <xml-property name="description" value="UUID representing unique key to this instance"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="networkPolicyFqdn" name="network-policy-fqdn" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Contrail FQDN for the policy" />
+                                               <xml-property name="description" value="Contrail FQDN for the policy"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="ID for the openStack Heat instance" />
+                                               <xml-property name="description" value="ID for the openStack Heat instance"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="nameProps" value="network-policy-fqdn" />
-                               <xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn" />
-                               <xml-property name="uniqueProps" value="network-policy-id" />
-                               <xml-property name="container" value="network-policies" />
-                               <xml-property name="namespace" value="network" />
+                               <xml-property name="nameProps" value="network-policy-fqdn"/>
+                               <xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn"/>
+                               <xml-property name="uniqueProps" value="network-policy-id"/>
+                               <xml-property name="container" value="network-policies"/>
+                               <xml-property name="namespace" value="network"/>
                        </xml-properties>
                </java-type>
                <java-type name="CtagAssignments">
-                       <xml-root-element name="ctag-assignments" />
+                       <xml-root-element name="ctag-assignments"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v8.CtagAssignment" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v8.CtagAssignment"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="CtagAssignment">
-                       <xml-root-element name="ctag-assignment" />
+                       <xml-root-element name="ctag-assignment"/>
                        <java-attributes>
                                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" required="true" type="java.lang.Long" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="id." />
+                                               <xml-property name="description" value="id."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="indexedProps" value="vlan-id-inner" />
-                               <xml-property name="dependentOn" value="l3-network" />
-                               <xml-property name="container" value="ctag-assignments" />
+                               <xml-property name="indexedProps" value="vlan-id-inner"/>
+                               <xml-property name="dependentOn" value="l3-network"/>
+                               <xml-property name="container" value="ctag-assignments"/>
                        </xml-properties>
                </java-type>
 
                <java-type name="Subnets">
-                       <xml-root-element name="subnets" />
+                       <xml-root-element name="subnets"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v8.Subnet" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v8.Subnet"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Subnet">
-                       <xml-root-element name="subnet" />
+                       <xml-root-element name="subnet"/>
                        <java-attributes>
                                <xml-element java-attribute="subnetId" name="subnet-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Subnet ID, should be UUID." />
+                                               <xml-property name="description" value="Subnet ID, should be UUID."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="subnetName" name="subnet-name" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Name associated with the subnet." />
+                                               <xml-property name="description" value="Name associated with the subnet."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Neutron id of this subnet" />
+                                               <xml-property name="description" value="Neutron id of this subnet"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="gatewayAddress" name="gateway-address" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="gateway ip address" />
+                                               <xml-property name="description" value="gateway ip address"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="network start address" />
+                                               <xml-property name="description" value="network start address"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="cidr mask" />
+                                               <xml-property name="description" value="cidr mask"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="ip version" />
+                                               <xml-property name="description" value="ip version"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+                                               <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element default-value="false" required="true" java-attribute="dhcpEnabled" name="dhcp-enabled" type="java.lang.Boolean">
+                               <xml-element default-value="false" java-attribute="dhcpEnabled" name="dhcp-enabled" required="true" type="java.lang.Boolean">
                                        <xml-properties>
                                                <xml-property name="defaultValue" value="false"/>
-                                               <xml-property name="description" value="dhcp enabled" />
+                                               <xml-property name="description" value="dhcp enabled"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="dhcpStart" name="dhcp-start" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the start address reserved for use by dhcp" />
+                                               <xml-property name="description" value="the start address reserved for use by dhcp"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="dhcpEnd" name="dhcp-end" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the last address reserved for use by dhcp" />
+                                               <xml-property name="description" value="the last address reserved for use by dhcp"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="indexedProps" value="subnet-id,subnet-name" />
-                               <xml-property name="nameProps" value="subnet-name" />
-                               <xml-property name="uniqueProps" value="subnet-id" />
-                               <xml-property name="dependentOn" value="l3-network" />
-                               <xml-property name="container" value="subnets" />
+                               <xml-property name="indexedProps" value="subnet-id,subnet-name"/>
+                               <xml-property name="nameProps" value="subnet-name"/>
+                               <xml-property name="uniqueProps" value="subnet-id"/>
+                               <xml-property name="dependentOn" value="l3-network"/>
+                               <xml-property name="container" value="subnets"/>
                        </xml-properties>
                </java-type>
 
                <java-type name="GenericVnfs">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of VNFs" />
+                               <xml-property name="description" value="Collection of VNFs"/>
                        </xml-properties>
-                       <xml-root-element name="generic-vnfs" />
+                       <xml-root-element name="generic-vnfs"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v8.GenericVnf" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v8.GenericVnf"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="GenericVnf">
-                       <xml-root-element name="generic-vnf" />
+                       <xml-root-element name="generic-vnf"/>
                        <java-attributes>
                                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
+                                               <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Name of VNF." />
+                                               <xml-property name="description" value="Name of VNF."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Alternate name of VNF." />
+                                               <xml-property name="description" value="Alternate name of VNF."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures." />
+                                               <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique identifier of service from ASDC" />
+                                               <xml-property name="description" value="Unique identifier of service from ASDC"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" />
+                                               <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                                               <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Indicator for whether the resource is considered operational" />
-                                               <xml-property name="dbAlias" value="operational-status" />
+                                               <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                                               <xml-property name="dbAlias" value="operational-status"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="License key" />
+                                               <xml-property name="description" value="License key"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Client should send valid enumerated value" />
+                                               <xml-property name="description" value="Client should send valid enumerated value"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Orchestration status of this VNF, used by MSO." />
+                                               <xml-property name="description" value="Orchestration status of this VNF, used by MSO."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+                                               <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                                               <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="identifier of managed by company or customer" />
+                                               <xml-property name="description" value="identifier of managed by company or customer"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf." />
+                                               <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="v4 Loopback0 address" />
+                                               <xml-property name="description" value="v4 Loopback0 address"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="nmLanV6Address" name="nm-lan-v6-address" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="v6 Loopback address" />
+                                               <xml-property name="description" value="v6 Loopback address"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="managementV6Address" name="management-v6-address" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="v6 management address" />
+                                               <xml-property name="description" value="v6 management address"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vcpu" name="vcpu" type="java.lang.Long">
                                        <xml-properties>
-                                               <xml-property name="description" value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors" />
+                                               <xml-property name="description" value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vcpuUnits" name="vcpu-units" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="units associated with vcpu, used for VNFs with no vservers/flavors" />
+                                               <xml-property name="description" value="units associated with vcpu, used for VNFs with no vservers/flavors"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vmemory" name="vmemory" type="java.lang.Long">
                                        <xml-properties>
-                                               <xml-property name="description" value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors" />
+                                               <xml-property name="description" value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vmemoryUnits" name="vmemory-units" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="units associated with vmemory, used for VNFs with no vservers/flavors" />
+                                               <xml-property name="description" value="units associated with vmemory, used for VNFs with no vservers/flavors"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vdisk" name="vdisk" type="java.lang.Long">
                                        <xml-properties>
-                                               <xml-property name="description" value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors" />
+                                               <xml-property name="description" value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vdiskUnits" name="vdisk-units" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors" />
+                                               <xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                               <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
                                        <xml-properties>
                                                <xml-property name="defaultValue" value="false"/>
-                                               <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                                               <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean">
+                               <xml-element default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" type="java.lang.Boolean">
                                        <xml-properties>
                                                <xml-property name="defaultValue" value="false"/>
-                                               <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node" />
+                                               <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="summaryStatus" name="summary-status" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="details regarding the generic-vnf operation" />
+                                               <xml-property name="description" value="details regarding the generic-vnf operation"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="encryptedAccessFlag" name="encrypted-access-flag" type="java.lang.Boolean">
                                        <xml-properties>
-                                               <xml-property name="description" value="indicates whether generic-vnf access uses SSH" />
+                                               <xml-property name="description" value="indicates whether generic-vnf access uses SSH"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
-                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
-                                               <xml-property name="requires" value="persona-model-version" />
-                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                                               <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                                               <xml-property name="requires" value="persona-model-version"/>
+                                               <xml-property name="visibility" value="deployment"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                                               <xml-property name="visibility" value="deployment" />
-                                               <xml-property name="requires" value="persona-model-id" />
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                                               <xml-property name="visibility" value="deployment"/>
+                                               <xml-property name="requires" value="persona-model-id"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                                               <xml-property name="visibility" value="internal" />
-                                               <xml-property name="dbAlias" value="model-version-id-local" />
-                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                                               <xml-property name="visibility" value="internal"/>
+                                               <xml-property name="dbAlias" value="model-version-id-local"/>
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                                               <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                                               <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="asNumber" name="as-number" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="as-number of the VNF" />
+                                               <xml-property name="description" value="as-number of the VNF"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="regionalResourceSubzone" name="regional-resource-subzone" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="represents sub zone of the rr plane" />
+                                               <xml-property name="description" value="represents sub zone of the rr plane"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
-                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v8.LInterfaces" />
-                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v8.LagInterfaces" />
-                               <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v8.VfModules" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v8.LInterfaces"/>
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v8.LagInterfaces"/>
+                               <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v8.VfModules"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="General purpose VNF" />
-                               <xml-property name="nameProps" value="vnf-name" />
-                               <xml-property name="indexedProps" value="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version" />
-                               <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" />
-                               <xml-property name="uniqueProps" value="vnf-id" />
-                               <xml-property name="container" value="generic-vnfs" />
-                               <xml-property name="namespace" value="network" />
-                               <xml-property name="extends" value="vnf" />
-                       </xml-properties>
+                               <xml-property name="description" value="General purpose VNF"/>
+                               <xml-property name="nameProps" value="vnf-name"/>
+                               <xml-property name="indexedProps" value="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version"/>
+                               <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
+                               <xml-property name="uniqueProps" value="vnf-id"/>
+                               <xml-property name="container" value="generic-vnfs"/>
+                               <xml-property name="namespace" value="network"/>
+                               <xml-property name="extends" value="vnf"/>
+                       <xml-property name="requiredProps" value="vnf-id,vnf-name,vnf-type,in-maint,is-closed-loop-disabled"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="VfModules">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs" />
+                               <xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs"/>
                        </xml-properties>
-                       <xml-root-element name="vf-modules" />
+                       <xml-root-element name="vf-modules"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v8.VfModule" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v8.VfModule"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="VfModule">
-                       <xml-root-element name="vf-module" />
+                       <xml-root-element name="vf-module"/>
                        <java-attributes>
                                <xml-element java-attribute="vfModuleId" name="vf-module-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique ID of vf-module." />
+                                               <xml-property name="description" value="Unique ID of vf-module."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vfModuleName" name="vf-module-name" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Name of vf-module" />
+                                               <xml-property name="description" value="Name of vf-module"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Heat stack id corresponding to this instance." />
+                                               <xml-property name="description" value="Heat stack id corresponding to this instance."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="orchestration status of this vf-module, mastered by MSO" />
+                                               <xml-property name="description" value="orchestration status of this vf-module, mastered by MSO"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element default-value="false" required="true" java-attribute="isBaseVfModule" name="is-base-vf-module" type="java.lang.Boolean">
+                               <xml-element default-value="false" java-attribute="isBaseVfModule" name="is-base-vf-module" required="true" type="java.lang.Boolean">
                                        <xml-properties>
                                                <xml-property name="defaultValue" value="false"/>
-                                               <xml-property name="description" value="used to indicate whether or not this object is base vf module" />
+                                               <xml-property name="description" value="used to indicate whether or not this object is base vf module"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
-                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
-                                               <xml-property name="requires" value="persona-model-version" />
-                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                                               <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                                               <xml-property name="requires" value="persona-model-version"/>
+                                               <xml-property name="visibility" value="deployment"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                                               <xml-property name="visibility" value="deployment" />
-                                               <xml-property name="requires" value="persona-model-id" />
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                                               <xml-property name="visibility" value="deployment"/>
+                                               <xml-property name="requires" value="persona-model-id"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                                               <xml-property name="visibility" value="internal" />
-                                               <xml-property name="dbAlias" value="model-version-id-local" />
-                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                                               <xml-property name="visibility" value="internal"/>
+                                               <xml-property name="dbAlias" value="model-version-id-local"/>
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                                               <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                                               <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="contrailServiceInstanceFqdn" name="contrail-service-instance-fqdn" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the Contrail unique ID for a service-instance" />
+                                               <xml-property name="description" value="the Contrail unique ID for a service-instance"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="a deployment unit of VNFCs" />
-                               <xml-property name="indexedProps" value="vf-module-id,vf-module-name,heat-stack-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-service-instance-fqdn" />
-                               <xml-property name="dependentOn" value="generic-vnf" />
-                               <xml-property name="container" value="vf-modules" />
-                       </xml-properties>
+                               <xml-property name="description" value="a deployment unit of VNFCs"/>
+                               <xml-property name="indexedProps" value="vf-module-id,vf-module-name,heat-stack-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-service-instance-fqdn"/>
+                               <xml-property name="dependentOn" value="generic-vnf"/>
+                               <xml-property name="container" value="vf-modules"/>
+                       <xml-property name="requiredProps" value="vf-module-id,is-base-vf-module"/>
+            </xml-properties>
                </java-type>
 
 
                <java-type name="LagLinks">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of link aggregation connections" />
+                               <xml-property name="description" value="Collection of link aggregation connections"/>
                        </xml-properties>
-                       <xml-root-element name="lag-links" />
+                       <xml-root-element name="lag-links"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v8.LagLink" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v8.LagLink"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="LagLink">
-                       <xml-root-element name="lag-link" />
+                       <xml-root-element name="lag-link"/>
                        <java-attributes>
                                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Alphabetical concatenation of lag-interface names" />
+                                               <xml-property name="description" value="Alphabetical concatenation of lag-interface names"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="LAG links can connect lag-interfaces" />
-                               <xml-property name="indexedProps" value="link-name" />
-                               <xml-property name="container" value="lag-links" />
-                               <xml-property name="namespace" value="network" />
-                       </xml-properties>
+                               <xml-property name="description" value="LAG links can connect lag-interfaces"/>
+                               <xml-property name="indexedProps" value="link-name"/>
+                               <xml-property name="container" value="lag-links"/>
+                               <xml-property name="namespace" value="network"/>
+                       <xml-property name="requiredProps" value="link-name"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="Newvces">
                        <xml-properties>
-                               <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
+                               <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce."/>
                        </xml-properties>
-                       <xml-root-element name="newvces" />
+                       <xml-root-element name="newvces"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v8.Newvce" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v8.Newvce"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Newvce">
-                       <xml-root-element name="newvce" />
+                       <xml-root-element name="newvce"/>
                        <java-attributes>
                                <xml-element java-attribute="vnfId2" name="vnf-id2" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object" />
+                                               <xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Name of VNF." />
+                                               <xml-property name="description" value="Name of VNF."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Alternate name of VNF." />
+                                               <xml-property name="description" value="Alternate name of VNF."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures." />
+                                               <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
+                                               <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Indicator for whether the resource is considered operational" />
-                                               <xml-property name="dbAlias" value="operational-status" />
+                                               <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                                               <xml-property name="dbAlias" value="operational-status"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="License key" />
+                                               <xml-property name="description" value="License key"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
+                                               <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Client should send valid enumerated value." />
+                                               <xml-property name="description" value="Client should send valid enumerated value."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="v4 Loopback0 address" />
+                                               <xml-property name="description" value="v4 Loopback0 address"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO." />
+                                               <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+                                               <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                                               <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
-                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v8.LInterfaces" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v8.LInterfaces"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
-                               <xml-property name="nameProps" value="vnf-name" />
-                               <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2" />
-                               <xml-property name="searchable" value="vnf-id2,vnf-name,vnf-name2" />
-                               <xml-property name="uniqueProps" value="vnf-id2" />
-                               <xml-property name="container" value="newvces" />
-                               <xml-property name="namespace" value="network" />
-                       </xml-properties>
+                               <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce."/>
+                               <xml-property name="nameProps" value="vnf-name"/>
+                               <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2"/>
+                               <xml-property name="searchable" value="vnf-id2,vnf-name,vnf-name2"/>
+                               <xml-property name="uniqueProps" value="vnf-id2"/>
+                               <xml-property name="container" value="newvces"/>
+                               <xml-property name="namespace" value="network"/>
+                       <xml-property name="requiredProps" value="vnf-id2,vnf-name,vnf-type"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="Pnfs">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of Physical Network Functions." />
+                               <xml-property name="description" value="Collection of Physical Network Functions."/>
                        </xml-properties>
-                       <xml-root-element name="pnfs" />
+                       <xml-root-element name="pnfs"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v8.Pnf" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v8.Pnf"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Pnf">
-                       <xml-root-element name="pnf" />
+                       <xml-root-element name="pnf"/>
                        <java-attributes>
                                <xml-element java-attribute="pnfName" name="pnf-name" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="unique name of Physical Network Function." />
+                                               <xml-property name="description" value="unique name of Physical Network Function."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="pnfName2" name="pnf-name2" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="name of Physical Network Function." />
+                                               <xml-property name="description" value="name of Physical Network Function."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="pnfName2Source" name="pnf-name2-source" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="source of name2" />
+                                               <xml-property name="description" value="source of name2"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="pnfId" name="pnf-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="id of pnf" />
+                                               <xml-property name="description" value="id of pnf"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Equipment type.  Source of truth should define valid values." />
+                                               <xml-property name="description" value="Equipment type.  Source of truth should define valid values."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values." />
+                                               <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Equipment model.  Source of truth should define valid values." />
+                                               <xml-property name="description" value="Equipment model.  Source of truth should define valid values."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="identifier of managed by company or customer" />
+                                               <xml-property name="description" value="identifier of managed by company or customer"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipaddressV4Oam" name="ipaddress-v4-oam" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses" />
+                                               <xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="swVersion" name="sw-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF." />
+                                               <xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="orchestration-status is the status of orchestration on the PNF." />
+                                               <xml-property name="description" value="orchestration-status is the status of orchestration on the PNF."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                               <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
                                        <xml-properties>
                                                <xml-property name="defaultValue" value="false"/>
-                                               <xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                                               <xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="frameId" name="frame-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed." />
+                                               <xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.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.v8.RelationshipList" />
-                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v8.PInterfaces" />
-                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v8.LagInterfaces" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
+                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v8.PInterfaces"/>
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v8.LagInterfaces"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world." />
-                               <xml-property name="indexedProps" value="pnf-name,orchestration-status" />
-                               <xml-property name="uniqueProps" value="pnf-name" />
-                               <xml-property name="container" value="pnfs" />
-                               <xml-property name="namespace" value="network" />
-                       </xml-properties>
+                               <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world."/>
+                               <xml-property name="indexedProps" value="pnf-name,orchestration-status"/>
+                               <xml-property name="uniqueProps" value="pnf-name"/>
+                               <xml-property name="container" value="pnfs"/>
+                               <xml-property name="namespace" value="network"/>
+                       <xml-property name="requiredProps" value="pnf-name,in-maint"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="PhysicalLinks">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
+                               <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/>
                        </xml-properties>
-                       <xml-root-element name="physical-links" />
+                       <xml-root-element name="physical-links"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v8.PhysicalLink" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v8.PhysicalLink"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="PhysicalLink">
-                       <xml-root-element name="physical-link" />
+                       <xml-root-element name="physical-link"/>
                        <java-attributes>
                                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ" />
+                                               <xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Captures the numeric part of the speed" />
+                                               <xml-property name="description" value="Captures the numeric part of the speed"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Captures the units corresponding to the speed" />
+                                               <xml-property name="description" value="Captures the units corresponding to the speed"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Circuit it" />
+                                               <xml-property name="description" value="Circuit it"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="dualMode" name="dual-mode" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Dual access mode (e.g., primary, secondary" />
+                                               <xml-property name="description" value="Dual access mode (e.g., primary, secondary"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider" />
+                                               <xml-property name="description" value="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="serviceProviderName" name="service-provider-name" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Name of the service Provider on this link." />
+                                               <xml-property name="description" value="Name of the service Provider on this link."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
-                               <xml-property name="indexedProps" value="circuit-id,link-name" />
-                               <xml-property name="alternateKeys1" value="circuit-id" />
-                               <xml-property name="container" value="physical-links" />
-                               <xml-property name="namespace" value="network" />
-                       </xml-properties>
+                               <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/>
+                               <xml-property name="indexedProps" value="circuit-id,link-name"/>
+                               <xml-property name="alternateKeys1" value="circuit-id"/>
+                               <xml-property name="container" value="physical-links"/>
+                               <xml-property name="namespace" value="network"/>
+                       <xml-property name="requiredProps" value="link-name"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="VigServers">
-                       <xml-root-element name="vig-servers" />
+                       <xml-root-element name="vig-servers"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v8.VigServer" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v8.VigServer"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="VigServer">
-                       <xml-root-element name="vig-server" />
+                       <xml-root-element name="vig-server"/>
                        <java-attributes>
                                <xml-element java-attribute="vigAddressType" name="vig-address-type" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET" />
+                                               <xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="v4 IP of the vig server" />
+                                               <xml-property name="description" value="v4 IP of the vig server"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="v6 IP of the vig server" />
+                                               <xml-property name="description" value="v6 IP of the vig server"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607" />
-                               <xml-property name="indexedProps" value="vig-address-type" />
-                               <xml-property name="dependentOn" value="ipsec-configuration" />
-                               <xml-property name="container" value="vig-servers" />
-                       </xml-properties>
+                               <xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607"/>
+                               <xml-property name="indexedProps" value="vig-address-type"/>
+                               <xml-property name="dependentOn" value="ipsec-configuration"/>
+                               <xml-property name="container" value="vig-servers"/>
+                       <xml-property name="requiredProps" value="vig-address-type"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="IpsecConfigurations">
-                       <xml-root-element name="ipsec-configurations" />
+                       <xml-root-element name="ipsec-configurations"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v8.IpsecConfiguration" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v8.IpsecConfiguration"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="IpsecConfiguration">
-                       <xml-root-element name="ipsec-configuration" />
+                       <xml-root-element name="ipsec-configuration"/>
                        <java-attributes>
                                <xml-element java-attribute="ipsecConfigurationId" name="ipsec-configuration-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="UUID of this configuration" />
+                                               <xml-property name="description" value="UUID of this configuration"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="requestedVigAddressType" name="requested-vig-address-type" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH" />
+                                               <xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="requestedEncryptionStrength" name="requested-encryption-strength" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
+                                               <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="can offer a shared DMZ or a DMZ specific to a customer" />
+                                               <xml-property name="description" value="can offer a shared DMZ or a DMZ specific to a customer"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Network address of shared DMZ" />
+                                               <xml-property name="description" value="Network address of shared DMZ"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="requestedCustomerName" name="requested-customer-name" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information" />
+                                               <xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ikeVersion" name="ike-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="can be 1 or 2" />
+                                               <xml-property name="description" value="can be 1 or 2"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ikev1Authentication" name="ikev1-authentication" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Contains values like md5, sha1, sha256, sha384" />
+                                               <xml-property name="description" value="Contains values like md5, sha1, sha256, sha384"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
+                                               <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14" />
+                                               <xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ikev1AmGroupId" name="ikev1-am-group-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Group name defined in VIG for clients using aggressive mode" />
+                                               <xml-property name="description" value="Group name defined in VIG for clients using aggressive mode"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ikev1AmPassword" name="ikev1-am-password" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="pre-shared key for the above group name " />
+                                               <xml-property name="description" value="pre-shared key for the above group name "/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ikev1SaLifetime" name="ikev1-sa-lifetime" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Lifetime for IKEv1 SA" />
+                                               <xml-property name="description" value="Lifetime for IKEv1 SA"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipsecAuthentication" name="ipsec-authentication" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="md5, sha1, sha256, sha384" />
+                                               <xml-property name="description" value="md5, sha1, sha256, sha384"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
+                                               <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Life time for IPSec SA" />
+                                               <xml-property name="description" value="Life time for IPSec SA"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipsecPfs" name="ipsec-pfs" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="enable PFS or not" />
+                                               <xml-property name="description" value="enable PFS or not"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="xauthUserId" name="xauth-userid" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="user ID for xAuth, sm-user, ,nmteHostName" />
+                                               <xml-property name="description" value="user ID for xAuth, sm-user, ,nmteHostName"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="xauthUserPassword" name="xauth-user-password" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Encrypted using the Juniper $9$ algorithm" />
+                                               <xml-property name="description" value="Encrypted using the Juniper $9$ algorithm"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="dpdInterval" name="dpd-interval" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="The time between DPD probe" />
+                                               <xml-property name="description" value="The time between DPD probe"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="dpdFrequency" name="dpd-frequency" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down" />
+                                               <xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
-                               <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v8.VigServers" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
+                               <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v8.VigServers"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C" />
-                               <xml-property name="indexedProps" value="ipsec-configuration-id" />
-                               <xml-property name="uniqueProps" value="ipsec-configuration-id" />
-                               <xml-property name="container" value="ipsec-configurations" />
-                               <xml-property name="namespace" value="network" />
-                       </xml-properties>
+                               <xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C"/>
+                               <xml-property name="indexedProps" value="ipsec-configuration-id"/>
+                               <xml-property name="uniqueProps" value="ipsec-configuration-id"/>
+                               <xml-property name="container" value="ipsec-configurations"/>
+                               <xml-property name="namespace" value="network"/>
+                       <xml-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.v8.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.v8.NotificationEventHeader"/>
+                               <xml-any-element java-attribute="entity"/>
                        </java-attributes>
                </java-type>
                <java-type name="NotificationEventHeader">
-                       <xml-root-element name="notification-event-header" />
-                       <java-attributes>
-                               <xml-element java-attribute="id" name="id" type="java.lang.String" />
-                               <xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String" />
-                               <xml-element java-attribute="sourceName" name="source-name" type="java.lang.String" />
-                               <xml-element java-attribute="domain" name="domain" type="java.lang.String" />
-                               <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String" />
-                               <xml-element java-attribute="severity" name="severity" type="java.lang.String" />
-                               <xml-element java-attribute="eventType" name="event-type" type="java.lang.String" />
-                               <xml-element java-attribute="version" name="version" type="java.lang.String" />
-                               <xml-element java-attribute="action" name="action" type="java.lang.String" />
-                               <xml-element java-attribute="entityType" name="entity-type" type="java.lang.String" />
-                               <xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String" />
-                               <xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String" />
-                               <xml-element java-attribute="status" name="status" type="java.lang.String" />
+                       <xml-root-element name="notification-event-header"/>
+                       <java-attributes>
+                               <xml-element java-attribute="id" name="id" type="java.lang.String"/>
+                               <xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String"/>
+                               <xml-element java-attribute="sourceName" name="source-name" type="java.lang.String"/>
+                               <xml-element java-attribute="domain" name="domain" type="java.lang.String"/>
+                               <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String"/>
+                               <xml-element java-attribute="severity" name="severity" type="java.lang.String"/>
+                               <xml-element java-attribute="eventType" name="event-type" type="java.lang.String"/>
+                               <xml-element java-attribute="version" name="version" type="java.lang.String"/>
+                               <xml-element java-attribute="action" name="action" type="java.lang.String"/>
+                               <xml-element java-attribute="entityType" name="entity-type" type="java.lang.String"/>
+                               <xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String"/>
+                               <xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String"/>
+                               <xml-element java-attribute="status" name="status" type="java.lang.String"/>
                        </java-attributes>
                </java-type>
                <java-type name="AaiInternal">
-                       <xml-root-element name="aai-internal" />
+                       <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.v8.ReservedPropNames" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v8.EdgePropNames" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v8.ReservedPropNames"/>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v8.EdgePropNames"/>
                        </java-attributes>
                </java-type>
                <java-type name="ReservedPropNames">
                        <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" />
+                               <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"/>
                        </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="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"/>
                        </java-attributes>
                </java-type>
                <java-type name="EdgePropNames">
                        <!-- NOTE that the names of these properties are not consistent and are in mixed case and hyphen case for now -->
                        <xml-properties>
-                               <xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules" />
-                               <xml-property name="edgeInfo" value="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV" />
+                               <xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules"/>
+                               <xml-property name="edgeInfo" value="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV"/>
                        </xml-properties>
-                       <xml-root-element name="edge-prop-names" />
+                       <xml-root-element name="edge-prop-names"/>
                        <java-attributes>
-                               <xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String" />
-                               <xml-element java-attribute="direction" name="direction" type="java.lang.String" />
-                               <xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String" />
-                               <xml-element java-attribute="isParent" name="isParent" type="java.lang.Boolean" />
-                               <xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean" />
-                               <xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean" />
-                               <xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.Boolean" />
-                               <xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" type="java.lang.Boolean" />
+                               <xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String"/>
+                               <xml-element java-attribute="direction" name="direction" type="java.lang.String"/>
+                               <xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String"/>
+                               <xml-element java-attribute="isParent" name="isParent" type="java.lang.Boolean"/>
+                               <xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean"/>
+                               <xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean"/>
+                               <xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.Boolean"/>
+                               <xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" type="java.lang.Boolean"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Models">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models" />
+                               <xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models"/>
                        </xml-properties>
-                       <xml-root-element name="models" />
+                       <xml-root-element name="models"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v8.Model" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v8.Model"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="Model">
                        <xml-properties>
-                               <xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models" />
-                               <xml-property name="nameProps" value="model-name,model-type" />
-                               <xml-property name="indexedProps" value="model-name-version-id,model-type,model-name,model-id,model-version" />
-                               <xml-property name="alternateKeys1" value="model-id,model-version" />
-                               <xml-property name="uniqueProps" value="model-name-version-id" />
-                               <xml-property name="container" value="models" />
-                               <xml-property name="namespace" value="service-design-and-creation" />
-                       </xml-properties>
-                       <xml-root-element name="model" />
+                               <xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models"/>
+                               <xml-property name="nameProps" value="model-name,model-type"/>
+                               <xml-property name="indexedProps" value="model-name-version-id,model-type,model-name,model-id,model-version"/>
+                               <xml-property name="alternateKeys1" value="model-id,model-version"/>
+                               <xml-property name="uniqueProps" value="model-name-version-id"/>
+                               <xml-property name="container" value="models"/>
+                               <xml-property name="namespace" value="service-design-and-creation"/>
+                       <xml-property name="requiredProps" value="model-name-version-id,model-type,model-name,model-id,model-version"/>
+            </xml-properties>
+                       <xml-root-element name="model"/>
                        <java-attributes>
                                <xml-element java-attribute="modelNameVersionId" name="model-name-version-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" />
+                                               <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." />
+                                               <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Name of the model, which can change from version to version." />
+                                               <xml-property name="description" value="Name of the model, which can change from version to version."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="modelId" name="model-id" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Invariant unique ID which does not change from version to version" />
+                                               <xml-property name="description" value="Invariant unique ID which does not change from version to version"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Version" />
+                                               <xml-property name="description" value="Version"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Description" />
+                                               <xml-property name="description" value="Description"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v8.ModelElements" />
-                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v8.Metadata" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v8.ModelElements"/>
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v8.Metadata"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="ModelElements">
-                       <xml-root-element name="model-elements" />
+                       <xml-root-element name="model-elements"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v8.ModelElement" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v8.ModelElement"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="ModelElement">
                        <xml-properties>
-                               <xml-property name="description" value="Defines how other models combine to make up a higher-level model." />
-                               <xml-property name="uniqueProps" value="model-element-uuid" />
-                               <xml-property name="indexedProps" value="model-element-uuid" />
-                               <xml-property name="allowDirectRead" value="true" />
-                               <xml-property name="allowDirectWrite" value="false" />
-                               <xml-property name="container" value="model-elements" />
-                       </xml-properties>
-                       <xml-root-element name="model-element" />
+                               <xml-property name="description" value="Defines how other models combine to make up a higher-level model."/>
+                               <xml-property name="uniqueProps" value="model-element-uuid"/>
+                               <xml-property name="indexedProps" value="model-element-uuid"/>
+                               <xml-property name="allowDirectRead" value="true"/>
+                               <xml-property name="allowDirectWrite" value="false"/>
+                               <xml-property name="container" value="model-elements"/>
+                       <xml-property name="requiredProps" value="model-element-uuid,new-data-del-flag,cardinality"/>
+            </xml-properties>
+                       <xml-root-element name="model-element"/>
                        <java-attributes>
                                <xml-element java-attribute="modelElementUuid" name="model-element-uuid" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="autoGenerateUuid" value="true" />
+                                               <xml-property name="autoGenerateUuid" value="true"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="newDataDelFlag" name="new-data-del-flag" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model" />
+                                               <xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="cardinality" name="cardinality" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="How many of this type of element are required/allowed" />
+                                               <xml-property name="description" value="How many of this type of element are required/allowed"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String">
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v8.ModelElements">
                                        <xml-properties>
-                                               <xml-property name="description" value="Defines how other models combine to make up a higher-level model" />
+                                               <xml-property name="description" value="Defines how other models combine to make up a higher-level model"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v8.ModelConstraints">
                                        <xml-properties>
-                                               <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition" />
+                                               <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="ModelConstraints">
-                       <xml-root-element name="model-constraints" />
+                       <xml-root-element name="model-constraints"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v8.ModelConstraint" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v8.ModelConstraint"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="ModelConstraint">
                        <xml-properties>
-                               <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
-                               <xml-property name="uniqueProps" value="model-constraint-uuid" />
-                               <xml-property name="indexedProps" value="model-constraint-uuid" />
-                               <xml-property name="allowDirectRead" value="true" />
-                               <xml-property name="allowDirectWrite" value="false" />
-                               <xml-property name="container" value="model-constraints" />
-                       </xml-properties>
-                       <xml-root-element name="model-constraint" />
+                               <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                               <xml-property name="uniqueProps" value="model-constraint-uuid"/>
+                               <xml-property name="indexedProps" value="model-constraint-uuid"/>
+                               <xml-property name="allowDirectRead" value="true"/>
+                               <xml-property name="allowDirectWrite" value="false"/>
+                               <xml-property name="container" value="model-constraints"/>
+                       <xml-property name="requiredProps" value="model-constraint-uuid,constrained-element-set-uuid-to-replace"/>
+            </xml-properties>
+                       <xml-root-element name="model-constraint"/>
                        <java-attributes>
                                <xml-element java-attribute="modelConstraintUuid" name="model-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="autoGenerateUuid" value="true" />
+                                               <xml-property name="autoGenerateUuid" value="true"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String" />
-                               <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v8.ConstrainedElementSets" />
+                               <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String"/>
+                               <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v8.ConstrainedElementSets"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="ConstrainedElementSets">
-                       <xml-root-element name="constrained-element-sets" />
+                       <xml-root-element name="constrained-element-sets"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v8.ConstrainedElementSet" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v8.ConstrainedElementSet"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="ConstrainedElementSet">
                        <xml-properties>
-                               <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
-                               <xml-property name="uniqueProps" value="constrained-element-set-uuid" />
-                               <xml-property name="indexedProps" value="constrained-element-set-uuid" />
-                               <xml-property name="allowDirectRead" value="true" />
-                               <xml-property name="allowDirectWrite" value="false" />
-                               <xml-property name="container" value="constrained-element-sets" />
-                       </xml-properties>
-                       <xml-root-element name="constrained-element-set" />
+                               <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                               <xml-property name="uniqueProps" value="constrained-element-set-uuid"/>
+                               <xml-property name="indexedProps" value="constrained-element-set-uuid"/>
+                               <xml-property name="allowDirectRead" value="true"/>
+                               <xml-property name="allowDirectWrite" value="false"/>
+                               <xml-property name="container" value="constrained-element-sets"/>
+                       <xml-property name="requiredProps" value="constrained-element-set-uuid,constraint-type,check-type"/>
+            </xml-properties>
+                       <xml-root-element name="constrained-element-set"/>
                        <java-attributes>
                                <xml-element java-attribute="constrainedElementSetUuid" name="constrained-element-set-uuid" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="autoGenerateUuid" value="true" />
+                                               <xml-property name="autoGenerateUuid" value="true"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" />
-                               <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String" />
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-                               <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v8.ElementChoiceSets" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String"/>
+                               <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String"/>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                               <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v8.ElementChoiceSets"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="ElementChoiceSets">
-                       <xml-root-element name="element-choice-sets" />
+                       <xml-root-element name="element-choice-sets"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v8.ElementChoiceSet" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v8.ElementChoiceSet"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="ElementChoiceSet">
                        <xml-properties>
-                               <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
-                               <xml-property name="uniqueProps" value="element-choice-set-uuid" />
-                               <xml-property name="indexedProps" value="element-choice-set-uuid" />
-                               <xml-property name="allowDirectRead" value="true" />
-                               <xml-property name="allowDirectWrite" value="false" />
-                               <xml-property name="container" value="element-choice-sets" />
-                       </xml-properties>
-                       <xml-root-element name="element-choice-set" />
+                               <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                               <xml-property name="uniqueProps" value="element-choice-set-uuid"/>
+                               <xml-property name="indexedProps" value="element-choice-set-uuid"/>
+                               <xml-property name="allowDirectRead" value="true"/>
+                               <xml-property name="allowDirectWrite" value="false"/>
+                               <xml-property name="container" value="element-choice-sets"/>
+                       <xml-property name="requiredProps" value="element-choice-set-uuid,element-choice-set-name"/>
+            </xml-properties>
+                       <xml-root-element name="element-choice-set"/>
                        <java-attributes>
                                <xml-element java-attribute="elementChoiceSetUuid" name="element-choice-set-uuid" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="autoGenerateUuid" value="true" />
+                                               <xml-property name="autoGenerateUuid" value="true"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String" />
-                               <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String" />
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-                               <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v8.ModelElements" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String"/>
+                               <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String"/>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                               <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v8.ModelElements"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="NamedQueries">
-                       <xml-root-element name="named-queries" />
+                       <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.v8.NamedQuery" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v8.NamedQuery"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="NamedQuery">
                        <xml-properties>
-                               <xml-property name="description" value="TBD" />
-                               <xml-property name="nameProps" value="named-query-name" />
-                               <xml-property name="uniqueProps" value="named-query-uuid" />
-                               <xml-property name="indexedProps" value="named-query-uuid,named-query-name" />
-                               <xml-property name="container" value="named-queries" />
-                               <xml-property name="namespace" value="service-design-and-creation" />
-                       </xml-properties>
-                       <xml-root-element name="named-query" />
-                       <java-attributes>
-                               <xml-element java-attribute="namedQueryUuid" name="named-query-uuid" required="true" type="java.lang.String" xml-key="true" />
-                               <xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String" />
-                               <xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" type="java.lang.String" />
+                               <xml-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-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.v8.NamedQueryElements" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <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.v8.NamedQueryElements"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="NamedQueryElements">
-                       <xml-root-element name="named-query-elements" />
+                       <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.v8.NamedQueryElement" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v8.NamedQueryElement"/>
                        </java-attributes>
                </java-type>
 
                <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.v8.NamedQueryElements" />
-                               <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v8.RelatedLookups" />
-                               <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v8.PropertyConstraints" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <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.v8.NamedQueryElements"/>
+                               <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v8.RelatedLookups"/>
+                               <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v8.PropertyConstraints"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="RelatedLookups">
-                       <xml-root-element name="related-lookups" />
+                       <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.v8.RelatedLookup" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v8.RelatedLookup"/>
                        </java-attributes>
                </java-type>
 
                <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.v8.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.v8.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.v8.PropertyConstraint" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v8.PropertyConstraint"/>
                        </java-attributes>
                </java-type>
 
                <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="property-name" name="property-name" required="true" type="java.lang.String" />
-                               <xml-element java-attribute="property-value" 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="property-name" name="property-name" required="true" type="java.lang.String"/>
+                               <xml-element java-attribute="property-value" 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.v8.QueryParameters" />
-                               <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v8.InstanceFilters" />
-                               <xml-element java-attribute="topNodeType"     name="top-node-type"    type="java.lang.String" />
+                               <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v8.QueryParameters"/>
+                               <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v8.InstanceFilters"/>
+                               <xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String"/>
                        </java-attributes>
                </java-type>
 
                <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.v8.NamedQuery" />
-                               <xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v8.Model" />
+                               <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v8.NamedQuery"/>
+                               <xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v8.Model"/>
                        </java-attributes>
                </java-type>
 
                <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.v8.InstanceFilter" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v8.InstanceFilter"/>
                        </java-attributes>
                </java-type>
 
                <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="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.v8.InventoryResponseItems" />
+                               <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v8.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.v8.InventoryResponseItem" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v8.InventoryResponseItem"/>
                        </java-attributes>
                </java-type>
 
                <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.v8.ExtraProperties" />
-                               <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v8.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.v8.ExtraProperties"/>
+                               <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v8.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-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v8.ExtraProperty" />
+                               <xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v8.ExtraProperty"/>
                        </java-attributes>
                </java-type>
 
                <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-any-element java-attribute="propertyValue" lax="true" name="property-value" />
+                               <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                               <xml-any-element java-attribute="propertyValue" lax="true" name="property-value"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="RouteTableReferences">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of openstack route table references" />
+                               <xml-property name="description" value="Collection of openstack route table references"/>
                        </xml-properties>
-                       <xml-root-element name="route-table-references" />
+                       <xml-root-element name="route-table-references"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v8.RouteTableReference" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v8.RouteTableReference"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="RouteTableReference">
-                       <xml-root-element name="route-table-reference" />
+                       <xml-root-element name="route-table-reference"/>
                        <java-attributes>
                                <xml-element java-attribute="routeTableReferenceId" name="route-table-reference-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." />
+                                               <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="routeTableReferenceFqdn" name="route-table-reference-fqdn" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="FQDN entry in the route table." />
+                                               <xml-property name="description" value="FQDN entry in the route table."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Concurrency value" />
+                                               <xml-property name="description" value="Concurrency value"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
 
                        <xml-properties>
-                               <xml-property name="description" value="Openstack route table reference." />
-                               <xml-property name="nameProps" value="route-table-reference-fqdn" />
-                               <xml-property name="uniqueProps" value="route-table-reference-id" />
-                               <xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn" />
-                               <xml-property name="container" value="route-table-references" />
-                               <xml-property name="namespace" value="network" />
-                       </xml-properties>
+                               <xml-property name="description" value="Openstack route table reference."/>
+                               <xml-property name="nameProps" value="route-table-reference-fqdn"/>
+                               <xml-property name="uniqueProps" value="route-table-reference-id"/>
+                               <xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn"/>
+                               <xml-property name="container" value="route-table-references"/>
+                               <xml-property name="namespace" value="network"/>
+                       <xml-property name="requiredProps" value="route-table-reference-id,route-table-reference-fqdn"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="SegmentationAssignments">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of openstack segmentation assignments" />
+                               <xml-property name="description" value="Collection of openstack segmentation assignments"/>
                        </xml-properties>
-                       <xml-root-element name="segmentation-assignments" />
+                       <xml-root-element name="segmentation-assignments"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v8.SegmentationAssignment" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v8.SegmentationAssignment"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="SegmentationAssignment">
-                       <xml-root-element name="segmentation-assignment" />
+                       <xml-root-element name="segmentation-assignment"/>
                        <java-attributes>
                                <xml-element java-attribute="segmentationId" name="segmentation-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." />
+                                               <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Concurrency value" />
+                                               <xml-property name="description" value="Concurrency value"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Openstack segmentation assignment." />
-                               <xml-property name="indexedProps" value="segmentation-id" />
-                               <xml-property name="dependentOn" value="l3-network" />
-                               <xml-property name="container" value="segmentation-assignments" />
-                       </xml-properties>
+                               <xml-property name="description" value="Openstack segmentation assignment."/>
+                               <xml-property name="indexedProps" value="segmentation-id"/>
+                               <xml-property name="dependentOn" value="l3-network"/>
+                               <xml-property name="container" value="segmentation-assignments"/>
+                       <xml-property name="requiredProps" value="segmentation-id"/>
+            </xml-properties>
                </java-type>
                <java-type name="Vnf">
                        <xml-root-element name="vnf"/>
                        <java-attributes>
                                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
+                                               <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
                                        </xml-properties>
                                </xml-element>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Abstract vnf class" />
-                               <xml-property name="indexedProps" value="vnf-id" />
-                               <xml-property name="uniqueProps" value="vnf-id" />
-                               <xml-property name="inheritors" value="vce,generic-vnf" />
-                               <xml-property name="abstract" value="true" />
-                       </xml-properties>
+                               <xml-property name="description" value="Abstract vnf class"/>
+                               <xml-property name="indexedProps" value="vnf-id"/>
+                               <xml-property name="uniqueProps" value="vnf-id"/>
+                               <xml-property name="inheritors" value="vce,generic-vnf"/>
+                               <xml-property name="abstract" value="true"/>
+                       <xml-property name="requiredProps" value="vnf-id"/>
+            </xml-properties>
                </java-type>
        </java-types>
 </xml-bindings>

diff --git a/aai-schema/src/main/resources/onap/oxm/v9/aai_oxm_v9.xml b/aai-schema/src/main/resources/onap/oxm/v9/aai_oxm_v9.xml
index ecffb2f..564db8d 100644 (file)
--- a/aai-schema/src/main/resources/onap/oxm/v9/aai_oxm_v9.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v9/aai_oxm_v9.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
 
     ============LICENSE_START=======================================================
@@ -21,422 +20,424 @@
 
     ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
--->
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v9" xml-mapping-metadata-complete="true">
+--><xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v9" xml-mapping-metadata-complete="true">
     <xml-schema element-form-default="QUALIFIED">
-        <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v9" />
+        <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v9"/>
     </xml-schema>
     <java-types>
         <java-type name="Inventory">
-            <xml-root-element name="inventory" />
-            <java-attributes>
-                <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v9.Search" />
-                <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v9.Actions" />
-                <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v9.CloudInfrastructure" />
-                <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v9.Business" />
-                <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v9.ServiceDesignAndCreation" />
-                <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v9.Network" />
-                <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v9.AaiInternal" />
+            <xml-root-element name="inventory"/>
+            <java-attributes>
+                <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v9.Search"/>
+                <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v9.Actions"/>
+                <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v9.CloudInfrastructure"/>
+                <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v9.Business"/>
+                <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v9.ServiceDesignAndCreation"/>
+                <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v9.Network"/>
+                <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v9.AaiInternal"/>
                 <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v9.Nodes"/>
             </java-attributes>
         </java-type>
 
         <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.v9.EdgeTagQueryResult" />
-                <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v9.EdgeTagQueryRequest" />
-                <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v9.SearchResults" />
-                <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v9.SdnZoneResponse" />
+                <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v9.EdgeTagQueryResult"/>
+                <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v9.EdgeTagQueryRequest"/>
+                <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v9.SearchResults"/>
+                <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v9.SdnZoneResponse"/>
             </java-attributes>
         </java-type>
 
         <java-type name="EdgeTagQueryResult">
-            <xml-root-element name="edge-tag-query-result" />
+            <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.v9.TaggedInventoryItemList" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v9.TaggedInventoryItemList"/>
             </java-attributes>
         </java-type>
 
         <java-type name="TaggedInventoryItemList">
-            <xml-root-element name="tagged-inventory-item-list" />
+            <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.v9.InventoryItem" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v9.InventoryItem"/>
             </java-attributes>
         </java-type>
 
         <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.v9.InventoryItemData" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v9.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.v9.InventoryItemData"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v9.TaggedInventoryItemList"/>
             </java-attributes>
         </java-type>
 
         <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.v9.StartNodeFilter" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v9.IncludeNodeFilter" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v9.SecondaryFilter" />
+                <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.v9.StartNodeFilter"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v9.IncludeNodeFilter"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v9.SecondaryFilter"/>
             </java-attributes>
         </java-type>
 
         <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.v9.ResultData" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v9.ResultData"/>
             </java-attributes>
         </java-type>
 
         <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.v9.OamNetworks" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v9.AzAndDvsSwitches" />
+                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v9.OamNetworks"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v9.AzAndDvsSwitches"/>
             </java-attributes>
         </java-type>
 
         <java-type name="AzAndDvsSwitches">
-            <xml-root-element name="az-and-dvs-switches" />
+            <xml-root-element name="az-and-dvs-switches"/>
             <java-attributes>
-                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v9.DvsSwitches" />
-                <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v9.AvailabilityZone" />
+                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v9.DvsSwitches"/>
+                <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v9.AvailabilityZone"/>
             </java-attributes>
         </java-type>
 
         <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.v9.Update" />
-                <xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v9.Notify" />
+                <xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v9.Update"/>
+                <xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v9.Notify"/>
             </java-attributes>
         </java-type>
 
         <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-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" />
+            <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.v9.UpdateNodeKey" />
-                <xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v9.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.v9.UpdateNodeKey"/>
+                <xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v9.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.v9.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.v9.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.v9.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.v9.KeyData"/>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"/>
             </java-attributes>
         </java-type>
 
         <java-type name="KeyData">
-            <xml-root-element name="key-data" />
+            <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="CloudInfrastructure">
             <xml-properties>
-                <xml-property name="description" value="Namespace for cloud infrastructure." />
+                <xml-property name="description" value="Namespace for cloud infrastructure."/>
             </xml-properties>
-            <xml-root-element name="cloud-infrastructure" />
+            <xml-root-element name="cloud-infrastructure"/>
             <java-attributes>
-                <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v9.Complexes" />
-                <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v9.CloudRegions" />
-                <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v9.NetworkProfiles" />
-                <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v9.Pservers" />
-                <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v9.VirtualDataCenters" />
+                <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v9.Complexes"/>
+                <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v9.CloudRegions"/>
+                <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v9.NetworkProfiles"/>
+                <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v9.Pservers"/>
+                <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v9.VirtualDataCenters"/>
             </java-attributes>
         </java-type>
 
         <java-type name="CloudRegions">
-            <xml-root-element name="cloud-regions" />
+            <xml-root-element name="cloud-regions"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v9.CloudRegion" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v9.CloudRegion"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="maximumDepth" value="0" />
+                <xml-property name="maximumDepth" value="0"/>
             </xml-properties>
         </java-type>
 
         <java-type name="CloudRegion">
-            <xml-root-element name="cloud-region" />
+            <xml-root-element name="cloud-region"/>
             <java-attributes>
                 <xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname" />
+                        <xml-property name="description" value="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key" />
+                        <xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="cloudType" name="cloud-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of the cloud (e.g., openstack)" />
+                        <xml-property name="description" value="Type of the cloud (e.g., openstack)"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ownerDefinedType" name="owner-defined-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Cloud-owner defined type indicator (e.g., dcp, lcp)" />
+                        <xml-property name="description" value="Cloud-owner defined type indicator (e.g., dcp, lcp)"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="cloudRegionVersion" name="cloud-region-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE." />
+                        <xml-property name="description" value="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL of the keystone identity service" />
+                        <xml-property name="description" value="URL of the keystone identity service"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="cloudZone" name="cloud-zone" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." />
+                        <xml-property name="description" value="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." />
+                        <xml-property name="description" value="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v9.VolumeGroups" />
-                <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v9.Tenants" />
-                <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v9.Flavors" />
-                <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v9.GroupAssignments" />
-                <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v9.Snapshots" />
-                <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v9.Images" />
-                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v9.DvsSwitches" />
-                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v9.OamNetworks" />
-                <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v9.AvailabilityZones" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v9.VolumeGroups"/>
+                <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v9.Tenants"/>
+                <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v9.Flavors"/>
+                <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v9.GroupAssignments"/>
+                <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v9.Snapshots"/>
+                <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v9.Images"/>
+                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v9.DvsSwitches"/>
+                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v9.OamNetworks"/>
+                <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v9.AvailabilityZones"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." />
-                <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type" />
-                <xml-property name="nameProps" value="owner-defined-type" />
-                <xml-property name="container" value="cloud-regions" />
-                <xml-property name="namespace" value="cloud-infrastructure" />
+                <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation."/>
+                <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type"/>
+                <xml-property name="nameProps" value="owner-defined-type"/>
+                <xml-property name="container" value="cloud-regions"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+            <xml-property name="requiredProps" value="cloud-owner,cloud-region-id"/>
             </xml-properties>
         </java-type>
         <java-type name="VolumeGroups">
             <xml-properties>
-                <xml-property name="description" value="Collection of persistent block-level storage." />
+                <xml-property name="description" value="Collection of persistent block-level storage."/>
             </xml-properties>
-            <xml-root-element name="volume-groups" />
+            <xml-root-element name="volume-groups"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v9.VolumeGroup" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v9.VolumeGroup"/>
             </java-attributes>
         </java-type>
 
         <java-type name="VolumeGroup">
-            <xml-root-element name="volume-group" />
+            <xml-root-element name="volume-group"/>
             <java-attributes>
                 <xml-element java-attribute="volumeGroupId" name="volume-group-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of volume-group." />
+                        <xml-property name="description" value="Unique ID of volume-group."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="volumeGroupName" name="volume-group-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the volume group." />
+                        <xml-property name="description" value="Name of the volume group."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Heat stack id corresponding to this volume-group" />
+                        <xml-property name="description" value="Heat stack id corresponding to this volume-group"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this volume-group" />
+                        <xml-property name="description" value="Orchestration status of this volume-group"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="personaModelCustomizationId" name="persona-model-customization-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." />
-                        <xml-property name="dbAlias" value="model-customization-id" />
+                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service."/>
+                        <xml-property name="dbAlias" value="model-customization-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfModulePersonaModelCustomizationId" name="vf-module-persona-model-customization-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="helps relate the volume group to the vf-module whose components will require the volume group" />
-                        <xml-property name="dbAlias" value="vf-module-model-customization-id" />
+                        <xml-property name="description" value="helps relate the volume group to the vf-module whose components will require the volume group"/>
+                        <xml-property name="dbAlias" value="vf-module-model-customization-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Persistent block-level storage." />
-                <xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id" />
-                <xml-property name="searchable" value="volume-group-id,volume-group-name" />
-                <xml-property name="dependentOn" value="cloud-region" />
-                <xml-property name="container" value="volume-groups" />
+                <xml-property name="description" value="Persistent block-level storage."/>
+                <xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id"/>
+                <xml-property name="searchable" value="volume-group-id,volume-group-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="volume-groups"/>
+            <xml-property name="requiredProps" value="volume-group-id,volume-group-name,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.v9.Relationship" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v9.Relationship"/>
             </java-attributes>
         </java-type>
 
         <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="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.v9.RelationshipData" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v9.RelatedToProperty" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v9.RelationshipData"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v9.RelatedToProperty"/>
             </java-attributes>
         </java-type>
 
         <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>
@@ -444,1429 +445,1452 @@
 
         <java-type name="Complexes">
             <xml-properties>
-                <xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
+                <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
             </xml-properties>
-            <xml-root-element name="complexes" />
+            <xml-root-element name="complexes"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v9.Complex" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v9.Complex"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="maximumDepth" value="0" />
+                <xml-property name="maximumDepth" value="0"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Complex">
-            <xml-root-element name="complex" />
+            <xml-root-element name="complex"/>
             <java-attributes>
                 <xml-element java-attribute="physicalLocationId" name="physical-location-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier for physical location, e.g., CLLI" />
+                        <xml-property name="description" value="Unique identifier for physical location, e.g., CLLI"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataCenterCode" name="data-center-code" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Data center code which can be an alternate way to identify a complex" />
+                        <xml-property name="description" value="Data center code which can be an alternate way to identify a complex"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Gamma complex name for LCP instance." />
+                        <xml-property name="description" value="Gamma complex name for LCP instance."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL of the keystone identity service" />
+                        <xml-property name="description" value="URL of the keystone identity service"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="physicalLocationType" name="physical-location-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type, e.g., central office, data center." />
+                        <xml-property name="description" value="Type, e.g., central office, data center."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String" />
-                <xml-element java-attribute="street2" name="street2" type="java.lang.String" />
-                <xml-element java-attribute="city" name="city" required="true" type="java.lang.String" />
-                <xml-element java-attribute="state" name="state" type="java.lang.String" />
-                <xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String" />
-                <xml-element java-attribute="country" name="country" required="true" type="java.lang.String" />
-                <xml-element java-attribute="region" name="region" required="true" type="java.lang.String" />
-                <xml-element java-attribute="latitude" name="latitude" type="java.lang.String" />
-                <xml-element java-attribute="longitude" name="longitude" type="java.lang.String" />
-                <xml-element java-attribute="elevation" name="elevation" type="java.lang.String" />
-                <xml-element java-attribute="lata" name="lata" type="java.lang.String" />
-                <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v9.CtagPools" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="street2" name="street2" type="java.lang.String"/>
+                <xml-element java-attribute="city" name="city" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="state" name="state" type="java.lang.String"/>
+                <xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="country" name="country" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="region" name="region" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="latitude" name="latitude" type="java.lang.String"/>
+                <xml-element java-attribute="longitude" name="longitude" type="java.lang.String"/>
+                <xml-element java-attribute="elevation" name="elevation" type="java.lang.String"/>
+                <xml-element java-attribute="lata" name="lata" type="java.lang.String"/>
+                <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v9.CtagPools"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
-                <xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id" />
-                <xml-property name="searchable" value="physical-location-id,data-center-code,complex-name,street1,street2,postal-code" />
-                <xml-property name="uniqueProps" value="physical-location-id" />
-                <xml-property name="container" value="complexes" />
-                <xml-property name="namespace" value="cloud-infrastructure" />
+                <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
+                <xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id"/>
+                <xml-property name="searchable" value="physical-location-id,data-center-code,complex-name,street1,street2,postal-code"/>
+                <xml-property name="uniqueProps" value="physical-location-id"/>
+                <xml-property name="container" value="complexes"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+            <xml-property name="requiredProps" value="physical-location-id,physical-location-type,street1,city,postal-code,country,region"/>
             </xml-properties>
         </java-type>
 
         <java-type name="CtagPools">
-            <xml-root-element name="ctag-pools" />
+            <xml-root-element name="ctag-pools"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v9.CtagPool" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v9.CtagPool"/>
             </java-attributes>
         </java-type>
 
         <java-type name="CtagPool">
-            <xml-root-element name="ctag-pool" />
+            <xml-root-element name="ctag-pool"/>
             <java-attributes>
                 <xml-element java-attribute="targetPe" name="target-pe" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="The Target provider edge router" />
+                        <xml-property name="description" value="The Target provider edge router"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the availability zone" />
+                        <xml-property name="description" value="Name of the availability zone"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ctagPoolPurpose" name="ctag-pool-purpose" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Describes what the intended purpose of this pool is." />
+                        <xml-property name="description" value="Describes what the intended purpose of this pool is."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ctagValues" name="ctag-values" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Comma separated list of ctags" />
+                        <xml-property name="description" value="Comma separated list of ctags"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose." />
-                <xml-property name="indexedProps" value="availability-zone-name" />
-                <xml-property name="dependentOn" value="complex" />
-                <xml-property name="container" value="ctag-pools" />
+                <xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose."/>
+                <xml-property name="indexedProps" value="availability-zone-name"/>
+                <xml-property name="dependentOn" value="complex"/>
+                <xml-property name="container" value="ctag-pools"/>
+            <xml-property name="requiredProps" value="target-pe,availability-zone-name,ctag-pool-purpose"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Tenants">
             <xml-properties>
-                <xml-property name="description" value="Collection of openstack tenants." />
+                <xml-property name="description" value="Collection of openstack tenants."/>
             </xml-properties>
-            <xml-root-element name="tenants" />
+            <xml-root-element name="tenants"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v9.Tenant" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v9.Tenant"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="maximumDepth" value="0" />
+                <xml-property name="maximumDepth" value="0"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Tenant">
-            <xml-root-element name="tenant" />
+            <xml-root-element name="tenant"/>
             <java-attributes>
                 <xml-element java-attribute="tenantId" name="tenant-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id relative to the cloud-region." />
+                        <xml-property name="description" value="Unique id relative to the cloud-region."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="tenantName" name="tenant-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Readable name of tenant" />
+                        <xml-property name="description" value="Readable name of tenant"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v9.Vservers" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v9.Vservers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Openstack tenant" />
-                <xml-property name="nameProps" value="tenant-name" />
-                <xml-property name="indexedProps" value="tenant-name,tenant-id" />
-                <xml-property name="searchable" value="tenant-id,tenant-name" />
-                <xml-property name="dependentOn" value="cloud-region" />
-                <xml-property name="container" value="tenants" />
+                <xml-property name="description" value="Openstack tenant"/>
+                <xml-property name="nameProps" value="tenant-name"/>
+                <xml-property name="indexedProps" value="tenant-name,tenant-id"/>
+                <xml-property name="searchable" value="tenant-id,tenant-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="tenants"/>
+            <xml-property name="requiredProps" value="tenant-id,tenant-name"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Vservers">
             <xml-properties>
-                <xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs." />
+                <xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs."/>
             </xml-properties>
-            <xml-root-element name="vservers" />
+            <xml-root-element name="vservers"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v9.Vserver" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v9.Vserver"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Vserver">
-            <xml-root-element name="vserver" />
+            <xml-root-element name="vserver"/>
             <java-attributes>
                 <xml-element java-attribute="vserverId" name="vserver-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier for this vserver relative to its tenant" />
+                        <xml-property name="description" value="Unique identifier for this vserver relative to its tenant"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vserverName" name="vserver-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of vserver" />
+                        <xml-property name="description" value="Name of vserver"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vserverName2" name="vserver-name2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Alternative name of vserver" />
+                        <xml-property name="description" value="Alternative name of vserver"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vserverSelflink" name="vserver-selflink" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
                     <xml-properties>
                         <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                        <xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean">
+                <xml-element default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" type="java.lang.Boolean">
                     <xml-properties>
                         <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="Used to indicate whether closed loop function is enabled on this node" />
+                        <xml-property name="description" value="Used to indicate whether closed loop function is enabled on this node"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v9.Volumes" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces" />
+                <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v9.Volumes"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Virtual Servers, aka virtual machine or VM." />
-                <xml-property name="nameProps" value="vserver-name" />
-                <xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2" />
-                <xml-property name="searchable" value="vserver-id,vserver-name,vserver-name2" />
-                <xml-property name="dependentOn" value="tenant" />
-                <xml-property name="container" value="vservers" />
+                <xml-property name="description" value="Virtual Servers, aka virtual machine or VM."/>
+                <xml-property name="nameProps" value="vserver-name"/>
+                <xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2"/>
+                <xml-property name="searchable" value="vserver-id,vserver-name,vserver-name2"/>
+                <xml-property name="dependentOn" value="tenant"/>
+                <xml-property name="container" value="vservers"/>
+            <xml-property name="requiredProps" value="vserver-id,vserver-name,vserver-selflink,in-maint,is-closed-loop-disabled"/>
             </xml-properties>
         </java-type>
 
         <java-type name="LInterfaces">
             <xml-properties>
-                <xml-property name="description" value="Collection of logical interfaces." />
+                <xml-property name="description" value="Collection of logical interfaces."/>
             </xml-properties>
-            <xml-root-element name="l-interfaces" />
+            <xml-root-element name="l-interfaces"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v9.LInterface" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v9.LInterface"/>
             </java-attributes>
         </java-type>
 
         <java-type name="LInterface">
-            <xml-root-element name="l-interface" />
+            <xml-root-element name="l-interface"/>
             <java-attributes>
                 <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Name given to the interface" />
+                        <xml-property name="description" value="Name given to the interface"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc." />
+                        <xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B." />
+                        <xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ID of interface" />
+                        <xml-property name="description" value="ID of interface"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="MAC address for the interface" />
+                        <xml-property name="description" value="MAC address for the interface"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the network" />
+                        <xml-property name="description" value="Name of the network"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Whether A&amp;AI should be managing this interface of not. Could have value like CUSTOMER" />
+                        <xml-property name="description" value="Whether A&amp;AI should be managing this interface of not. Could have value like CUSTOMER"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Human friendly text regarding this interface." />
+                        <xml-property name="description" value="Human friendly text regarding this interface."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v9.Vlans" />
-                <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v9.SriovVfs" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v9.L3InterfaceIpv4AddressList" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v9.L3InterfaceIpv6AddressList" />
+                <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v9.Vlans"/>
+                <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v9.SriovVfs"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v9.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v9.L3InterfaceIpv6AddressList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Logical interfaces, e.g., a vnic." />
-                <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name" />
-                <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface" />
-                <xml-property name="container" value="l-interfaces" />
+                <xml-property name="description" value="Logical interfaces, e.g., a vnic."/>
+                <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name"/>
+                <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface"/>
+                <xml-property name="container" value="l-interfaces"/>
+            <xml-property name="requiredProps" value="interface-name"/>
             </xml-properties>
         </java-type>
 
         <java-type name="SriovVfs">
             <xml-properties>
-                <xml-property name="description" value="Collection of SR-IOV Virtual Functions." />
+                <xml-property name="description" value="Collection of SR-IOV Virtual Functions."/>
             </xml-properties>
-            <xml-root-element name="sriov-vfs" />
+            <xml-root-element name="sriov-vfs"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v9.SriovVf" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v9.SriovVf"/>
             </java-attributes>
         </java-type>
         <java-type name="SriovVf">
-            <xml-root-element name="sriov-vf" />
+            <xml-root-element name="sriov-vf"/>
             <java-attributes>
                 <xml-element java-attribute="pciId" name="pci-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="PCI ID used to identify the sriov-vf" />
+                        <xml-property name="description" value="PCI ID used to identify the sriov-vf"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfVlanFilter" name="vf-vlan-filter" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM." />
+                        <xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfMacFilter" name="vf-mac-filter" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM." />
+                        <xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfVlanStrip" name="vf-vlan-strip" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM." />
+                        <xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfVlanAntiSpoofCheck" name="vf-vlan-anti-spoof-check" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs." />
+                        <xml-property name="description" value="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfMacAntiSpoofCheck" name="vf-mac-anti-spoof-check" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs." />
+                        <xml-property name="description" value="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfMirrors" name="vf-mirrors" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports." />
+                        <xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfBroadcastAllow" name="vf-broadcast-allow" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM" />
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfUnknownMulticastAllow" name="vf-unknown-multicast-allow" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM" />
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfUnknownUnicastAllow" name="vf-unknown-unicast-allow" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM" />
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfInsertStag" name="vf-insert-stag" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM." />
+                        <xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfLinkStatus" name="vf-link-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto." />
+                        <xml-property name="description" value="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron network id of the interface" />
+                        <xml-property name="description" value="Neutron network id of the interface"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)" />
-                <xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id" />
-                <xml-property name="dependentOn" value="l-interface" />
-                <xml-property name="container" value="sriov-vfs" />
+                <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)"/>
+                <xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id"/>
+                <xml-property name="dependentOn" value="l-interface"/>
+                <xml-property name="container" value="sriov-vfs"/>
+            <xml-property name="requiredProps" value="pci-id"/>
             </xml-properties>
         </java-type>
 
         <java-type name="L3InterfaceIpv4AddressList">
-            <xml-root-element name="l3-interface-ipv4-address-list" />
+            <xml-root-element name="l3-interface-ipv4-address-list"/>
             <java-attributes>
                 <xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="IP address" />
+                        <xml-property name="description" value="IP address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Prefix length, 32 for single address" />
+                        <xml-property name="description" value="Prefix length, 32 for single address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Inner VLAN tag" />
+                        <xml-property name="description" value="Inner VLAN tag"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Outer VLAN tag" />
+                        <xml-property name="description" value="Outer VLAN tag"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator of fixed or floating address" />
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron network id of the interface that address belongs to" />
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron id of subnet that address belongs to" />
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="IPv4 Address Range" />
-                <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-                <xml-property name="dependentOn" value="vlan,l-interface" />
+                <xml-property name="description" value="IPv4 Address Range"/>
+                <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="dependentOn" value="vlan,l-interface"/>
+            <xml-property name="requiredProps" value="l3-interface-ipv4-address"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Vlans">
-            <xml-root-element name="vlans" />
+            <xml-root-element name="vlans"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v9.Vlan" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v9.Vlan"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Vlan">
-            <xml-root-element name="vlan" />
+            <xml-root-element name="vlan"/>
             <java-attributes>
                 <xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="String that identifies the interface" />
+                        <xml-property name="description" value="String that identifies the interface"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Inner VLAN tag" />
+                        <xml-property name="description" value="Inner VLAN tag"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Outer VLAN tag" />
+                        <xml-property name="description" value="Outer VLAN tag"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the numeric part of the speed" />
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the units corresponding to the speed" />
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vlanDescription" name="vlan-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used to describe (the service associated with) the vlan" />
+                        <xml-property name="description" value="Used to describe (the service associated with) the vlan"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="backdoorConnection" name="backdoor-connection" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Whether customer is going to use this VLAN for backdoor connection to another customer premise device." />
+                        <xml-property name="description" value="Whether customer is going to use this VLAN for backdoor connection to another customer premise device."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vpnId" name="vpn-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan" />
-                        <xml-property name="dbAlias" value="vpn-id-local" />
+                        <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan"/>
+                        <xml-property name="dbAlias" value="vpn-id-local"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C." />
+                        <xml-property name="description" value="Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v9.L3InterfaceIpv4AddressList" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v9.L3InterfaceIpv6AddressList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v9.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v9.L3InterfaceIpv6AddressList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Definition of vlan" />
-                <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-id" />
-                <xml-property name="uniqueProps" value="vpn-id" />
-                <xml-property name="dependentOn" value="l-interface" />
-                <xml-property name="container" value="vlans" />
+                <xml-property name="description" value="Definition of vlan"/>
+                <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-id"/>
+                <xml-property name="uniqueProps" value="vpn-id"/>
+                <xml-property name="dependentOn" value="l-interface"/>
+                <xml-property name="container" value="vlans"/>
+            <xml-property name="requiredProps" value="vlan-interface"/>
             </xml-properties>
         </java-type>
 
         <java-type name="L3InterfaceIpv6AddressList">
-            <xml-root-element name="l3-interface-ipv6-address-list" />
+            <xml-root-element name="l3-interface-ipv6-address-list"/>
             <java-attributes>
                 <xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="IP address" />
+                        <xml-property name="description" value="IP address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Prefix length, 128 for single address" />
+                        <xml-property name="description" value="Prefix length, 128 for single address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Inner VLAN tag" />
+                        <xml-property name="description" value="Inner VLAN tag"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Outer VLAN tag" />
+                        <xml-property name="description" value="Outer VLAN tag"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator of fixed or floating address" />
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron network id of the interface that address belongs to" />
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron id of subnet that address belongs to" />
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="IPv6 Address Range" />
-                <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-                <xml-property name="dependentOn" value="vlan,l-interface" />
+                <xml-property name="description" value="IPv6 Address Range"/>
+                <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="dependentOn" value="vlan,l-interface"/>
+            <xml-property name="requiredProps" value="l3-interface-ipv6-address"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Volumes">
             <xml-properties>
-                <xml-property name="description" value="Collection of ephemeral Block storage volumes." />
+                <xml-property name="description" value="Collection of ephemeral Block storage volumes."/>
             </xml-properties>
-            <xml-root-element name="volumes" />
+            <xml-root-element name="volumes"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v9.Volume" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v9.Volume"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Volume">
-            <xml-root-element name="volume" />
+            <xml-root-element name="volume"/>
             <java-attributes>
                 <xml-element java-attribute="volumeId" name="volume-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of block storage volume relative to the vserver." />
+                        <xml-property name="description" value="Unique ID of block storage volume relative to the vserver."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="volumeSelflink" name="volume-selflink" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Ephemeral Block storage volume." />
-                <xml-property name="indexedProps" value="volume-id" />
-                <xml-property name="dependentOn" value="vserver" />
-                <xml-property name="container" value="volumes" />
+                <xml-property name="description" value="Ephemeral Block storage volume."/>
+                <xml-property name="indexedProps" value="volume-id"/>
+                <xml-property name="dependentOn" value="vserver"/>
+                <xml-property name="container" value="volumes"/>
+            <xml-property name="requiredProps" value="volume-id,volume-selflink"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Flavors">
             <xml-properties>
-                <xml-property name="description" value="Collection of openstack flavors." />
+                <xml-property name="description" value="Collection of openstack flavors."/>
             </xml-properties>
-            <xml-root-element name="flavors" />
+            <xml-root-element name="flavors"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v9.Flavor" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v9.Flavor"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Flavor">
-            <xml-root-element name="flavor" />
+            <xml-root-element name="flavor"/>
             <java-attributes>
                 <xml-element java-attribute="flavorId" name="flavor-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Flavor id, expected to be unique across cloud-region." />
+                        <xml-property name="description" value="Flavor id, expected to be unique across cloud-region."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Flavor name" />
+                        <xml-property name="description" value="Flavor name"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Number of CPUs" />
+                        <xml-property name="description" value="Number of CPUs"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="flavorRam" name="flavor-ram" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Amount of memory" />
+                        <xml-property name="description" value="Amount of memory"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="flavorDisk" name="flavor-disk" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Disk space" />
+                        <xml-property name="description" value="Disk space"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="flavorEphemeral" name="flavor-ephemeral" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Amount of ephemeral disk space" />
+                        <xml-property name="description" value="Amount of ephemeral disk space"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="flavorSwap" name="flavor-swap" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="amount of swap space allocation" />
+                        <xml-property name="description" value="amount of swap space allocation"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="flavorIsPublic" name="flavor-is-public" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in." />
+                        <xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="flavorSelflink" name="flavor-selflink" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="flavorDisabled" name="flavor-disabled" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Boolean as to whether this flavor is no longer enabled" />
+                        <xml-property name="description" value="Boolean as to whether this flavor is no longer enabled"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Openstack flavor." />
-                <xml-property name="nameProps" value="flavor-name" />
-                <xml-property name="indexedProps" value="flavor-name,flavor-id" />
-                <xml-property name="dependentOn" value="cloud-region" />
-                <xml-property name="container" value="flavors" />
+                <xml-property name="description" value="Openstack flavor."/>
+                <xml-property name="nameProps" value="flavor-name"/>
+                <xml-property name="indexedProps" value="flavor-name,flavor-id"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="flavors"/>
+            <xml-property name="requiredProps" value="flavor-id,flavor-name,flavor-selflink"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Snapshots">
             <xml-properties>
-                <xml-property name="description" value="Collection of openstack snapshots" />
+                <xml-property name="description" value="Collection of openstack snapshots"/>
             </xml-properties>
-            <xml-root-element name="snapshots" />
+            <xml-root-element name="snapshots"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v9.Snapshot" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v9.Snapshot"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Snapshot">
-            <xml-root-element name="snapshot" />
+            <xml-root-element name="snapshot"/>
             <java-attributes>
                 <xml-element java-attribute="snapshotId" name="snapshot-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots." />
+                        <xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="snapshotName" name="snapshot-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Snapshot name" />
+                        <xml-property name="description" value="Snapshot name"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="snapshotArchitecture" name="snapshot-architecture" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Operating system architecture" />
+                        <xml-property name="description" value="Operating system architecture"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="snapshotOsDistro" name="snapshot-os-distro" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The common name of the operating system distribution in lowercase" />
+                        <xml-property name="description" value="The common name of the operating system distribution in lowercase"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="snapshotOsVersion" name="snapshot-os-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The operating system version as specified by the distributor." />
+                        <xml-property name="description" value="The operating system version as specified by the distributor."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="application" name="application" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The application that the image instantiates." />
+                        <xml-property name="description" value="The application that the image instantiates."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The vendor of the application." />
+                        <xml-property name="description" value="The vendor of the application."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The version of the application." />
+                        <xml-property name="description" value="The version of the application."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="snapshotSelflink" name="snapshot-selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="prevSnapshotId" name="prev-snapshot-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)." />
+                        <xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Openstack snapshot" />
-                <xml-property name="nameProps" value="snapshot-name" />
-                <xml-property name="uniqueProps" value="snapshot-id" />
-                <xml-property name="indexedProps" value="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id" />
-                <xml-property name="dependentOn" value="cloud-region" />
-                <xml-property name="container" value="snapshots" />
+                <xml-property name="description" value="Openstack snapshot"/>
+                <xml-property name="nameProps" value="snapshot-name"/>
+                <xml-property name="uniqueProps" value="snapshot-id"/>
+                <xml-property name="indexedProps" value="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="snapshots"/>
+            <xml-property name="requiredProps" value="snapshot-id"/>
             </xml-properties>
         </java-type>
 
         <java-type name="GroupAssignments">
             <xml-properties>
-                <xml-property name="description" value="Collection of openstack group assignments" />
+                <xml-property name="description" value="Collection of openstack group assignments"/>
             </xml-properties>
-            <xml-root-element name="group-assignments" />
+            <xml-root-element name="group-assignments"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v9.GroupAssignment" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v9.GroupAssignment"/>
             </java-attributes>
         </java-type>
 
         <java-type name="GroupAssignment">
-            <xml-root-element name="group-assignment" />
+            <xml-root-element name="group-assignment"/>
             <java-attributes>
                 <xml-element java-attribute="groupId" name="group-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Group id, expected to be unique across cloud-region." />
+                        <xml-property name="description" value="Group id, expected to be unique across cloud-region."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="groupType" name="group-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Group type - the type of group this instance refers to" />
+                        <xml-property name="description" value="Group type - the type of group this instance refers to"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="groupName" name="group-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Group name - name assigned to the group" />
+                        <xml-property name="description" value="Group name - name assigned to the group"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="groupDescription" name="group-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Group description - description of the group" />
+                        <xml-property name="description" value="Group description - description of the group"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)." />
-                <xml-property name="nameProps" value="group-name" />
-                <xml-property name="indexedProps" value="group-id,group-type,group-name" />
-                <xml-property name="dependentOn" value="cloud-region" />
-                <xml-property name="container" value="group-assignments" />
+                <xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)."/>
+                <xml-property name="nameProps" value="group-name"/>
+                <xml-property name="indexedProps" value="group-id,group-type,group-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="group-assignments"/>
+            <xml-property name="requiredProps" value="group-id,group-type,group-name"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Images">
             <xml-properties>
-                <xml-property name="description" value="Collectio of Openstack images." />
+                <xml-property name="description" value="Collectio of Openstack images."/>
             </xml-properties>
-            <xml-root-element name="images" />
+            <xml-root-element name="images"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v9.Image" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v9.Image"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Image">
-            <xml-root-element name="image" />
+            <xml-root-element name="image"/>
             <java-attributes>
                 <xml-element java-attribute="imageId" name="image-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Image id, expected to be unique across cloud region" />
+                        <xml-property name="description" value="Image id, expected to be unique across cloud region"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="imageName" name="image-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Image name" />
+                        <xml-property name="description" value="Image name"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="imageArchitecture" name="image-architecture" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Operating system architecture." />
+                        <xml-property name="description" value="Operating system architecture."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="imageOsDistro" name="image-os-distro" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The common name of the operating system distribution in lowercase" />
+                        <xml-property name="description" value="The common name of the operating system distribution in lowercase"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="imageOsVersion" name="image-os-version" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The operating system version as specified by the distributor." />
+                        <xml-property name="description" value="The operating system version as specified by the distributor."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="application" name="application" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The application that the image instantiates." />
+                        <xml-property name="description" value="The application that the image instantiates."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The vendor of the application." />
+                        <xml-property name="description" value="The vendor of the application."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The version of the application." />
+                        <xml-property name="description" value="The version of the application."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="imageSelflink" name="image-selflink" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
-                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v9.Metadata" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v9.Metadata"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Openstack image." />
-                <xml-property name="nameProps" value="image-name" />
-                <xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version" />
-                <xml-property name="dependentOn" value="cloud-region" />
-                <xml-property name="container" value="images" />
+                <xml-property name="description" value="Openstack image."/>
+                <xml-property name="nameProps" value="image-name"/>
+                <xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="images"/>
+            <xml-property name="requiredProps" value="image-id,image-name,image-os-distro,image-os-version,image-selflink"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Metadata">
             <xml-properties>
-                <xml-property name="description" value="Collection of metadatum (key/value pairs)" />
+                <xml-property name="description" value="Collection of metadatum (key/value pairs)"/>
             </xml-properties>
-            <xml-root-element name="metadata" />
+            <xml-root-element name="metadata"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v9.Metadatum" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v9.Metadatum"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Metadatum">
-            <xml-root-element name="metadatum" />
+            <xml-root-element name="metadatum"/>
             <java-attributes>
-                <xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true" />
-                <xml-element java-attribute="metaval" name="metaval" required="true" type="java.lang.String" />
+                <xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true"/>
+                <xml-element java-attribute="metaval" name="metaval" required="true" type="java.lang.String"/>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Key/value pairs" />
-                <xml-property name="indexedProps" value="metaname" />
-                <xml-property name="dependentOn" value="tenant,image,service-instance,connector,model" />
-                <xml-property name="container" value="metadata" />
+                <xml-property name="description" value="Key/value pairs"/>
+                <xml-property name="indexedProps" value="metaname"/>
+                <xml-property name="dependentOn" value="tenant,image,service-instance,connector,model"/>
+                <xml-property name="container" value="metadata"/>
+            <xml-property name="requiredProps" value="metaname,metaval"/>
             </xml-properties>
         </java-type>
 
         <java-type name="DvsSwitches">
             <xml-properties>
-                <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs." />
+                <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs."/>
             </xml-properties>
-            <xml-root-element name="dvs-switches" />
+            <xml-root-element name="dvs-switches"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v9.DvsSwitch" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v9.DvsSwitch"/>
             </java-attributes>
         </java-type>
 
         <java-type name="DvsSwitch">
-            <xml-root-element name="dvs-switch" />
+            <xml-root-element name="dvs-switch"/>
             <java-attributes>
                 <xml-element java-attribute="switchName" name="switch-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="DVS switch name" />
+                        <xml-property name="description" value="DVS switch name"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vcenterUrl" name="vcenter-url" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL used to reach the vcenter" />
+                        <xml-property name="description" value="URL used to reach the vcenter"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. " />
-                <xml-property name="indexedProps" value="vcenter-url,switch-name" />
-                <xml-property name="dependentOn" value="cloud-region" />
-                <xml-property name="container" value="dvs-switches" />
+                <xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. "/>
+                <xml-property name="indexedProps" value="vcenter-url,switch-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="dvs-switches"/>
+            <xml-property name="requiredProps" value="switch-name,vcenter-url"/>
             </xml-properties>
         </java-type>
 
         <java-type name="NetworkProfiles">
             <xml-properties>
-                <xml-property name="description" value="Collection of network profiles" />
+                <xml-property name="description" value="Collection of network profiles"/>
             </xml-properties>
-            <xml-root-element name="network-profiles" />
+            <xml-root-element name="network-profiles"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v9.NetworkProfile" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v9.NetworkProfile"/>
             </java-attributes>
         </java-type>
 
         <java-type name="NetworkProfile">
-            <xml-root-element name="network-profile" />
+            <xml-root-element name="network-profile"/>
             <java-attributes>
                 <xml-element java-attribute="nmProfileName" name="nm-profile-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique name of network profile." />
+                        <xml-property name="description" value="Unique name of network profile."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="communityString" name="community-string" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Encrypted SNMP community string" />
+                        <xml-property name="description" value="Encrypted SNMP community string"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Network profile populated by SDN-GP for SNMP" />
-                <xml-property name="indexedProps" value="nm-profile-name" />
-                <xml-property name="container" value="network-profiles" />
-                <xml-property name="namespace" value="cloud-infrastructure" />
+                <xml-property name="description" value="Network profile populated by SDN-GP for SNMP"/>
+                <xml-property name="indexedProps" value="nm-profile-name"/>
+                <xml-property name="container" value="network-profiles"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+            <xml-property name="requiredProps" value="nm-profile-name"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Pservers">
             <xml-properties>
-                <xml-property name="description" value="Collection of compute hosts." />
+                <xml-property name="description" value="Collection of compute hosts."/>
             </xml-properties>
-            <xml-root-element name="pservers" />
+            <xml-root-element name="pservers"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v9.Pserver" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v9.Pserver"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="maximumDepth" value="0" />
+                <xml-property name="maximumDepth" value="0"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Pserver">
-            <xml-root-element name="pserver" />
+            <xml-root-element name="pserver"/>
             <java-attributes>
                 <xml-element java-attribute="hostname" name="hostname" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Value from executing hostname on the compute node." />
+                        <xml-property name="description" value="Value from executing hostname on the compute node."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="PTNII name" />
+                        <xml-property name="description" value="PTNII name"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="numberOfCpus" name="number-of-cpus" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Number of cpus" />
+                        <xml-property name="description" value="Number of cpus"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="diskInGigabytes" name="disk-in-gigabytes" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Disk size, in GBs" />
+                        <xml-property name="description" value="Disk size, in GBs"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ramInMegabytes" name="ram-in-megabytes" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="RAM size, in MBs" />
+                        <xml-property name="description" value="RAM size, in MBs"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values." />
+                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values." />
+                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values." />
+                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="fqdn" name="fqdn" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Fully-qualified domain name" />
+                        <xml-property name="description" value="Fully-qualified domain name"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="pserverSelflink" name="pserver-selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device." />
+                        <xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Serial number, may be queried" />
+                        <xml-property name="description" value="Serial number, may be queried"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV4 Loopback 0 address" />
+                        <xml-property name="description" value="IPV4 Loopback 0 address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV6 Loopback 0 address" />
+                        <xml-property name="description" value="IPV6 Loopback 0 address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV4 AIM address" />
+                        <xml-property name="description" value="IPV4 AIM address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV6 AIM address" />
+                        <xml-property name="description" value="IPV6 AIM address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV6 OAM address" />
+                        <xml-property name="description" value="IPV6 OAM address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI." />
+                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="pserverId" name="pserver-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ID of Pserver" />
+                        <xml-property name="description" value="ID of Pserver"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="internetTopology" name="internet-topology" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="internet topology of Pserver" />
+                        <xml-property name="description" value="internet topology of Pserver"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
                     <xml-properties>
                         <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="pserverName2" name="pserver-name2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="alternative pserver name" />
+                        <xml-property name="description" value="alternative pserver name"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="purpose of pserver" />
+                        <xml-property name="description" value="purpose of pserver"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" />
+                        <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
-                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v9.PInterfaces" />
-                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v9.LagInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v9.PInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v9.LagInterfaces"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver." />
-                <xml-property name="nameProps" value="pserver-name2" />
-                <xml-property name="indexedProps" value="hostname,in-maint,pserver-id,pserver-name2,inv-status" />
-                <xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address" />
-                <xml-property name="container" value="pservers" />
-                <xml-property name="namespace" value="cloud-infrastructure" />
+                <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver."/>
+                <xml-property name="nameProps" value="pserver-name2"/>
+                <xml-property name="indexedProps" value="hostname,in-maint,pserver-id,pserver-name2,inv-status"/>
+                <xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address"/>
+                <xml-property name="container" value="pservers"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+            <xml-property name="requiredProps" value="hostname,in-maint"/>
             </xml-properties>
         </java-type>
 
         <java-type name="PInterfaces">
             <xml-properties>
-                <xml-property name="description" value="Collection of physical interfaces." />
+                <xml-property name="description" value="Collection of physical interfaces."/>
             </xml-properties>
-            <xml-root-element name="p-interfaces" />
+            <xml-root-element name="p-interfaces"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v9.PInterface" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v9.PInterface"/>
             </java-attributes>
         </java-type>
 
         <java-type name="PInterface">
-            <xml-root-element name="p-interface" />
+            <xml-root-element name="p-interface"/>
             <java-attributes>
                 <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Name that identifies the physical interface" />
+                        <xml-property name="description" value="Name that identifies the physical interface"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the numeric part of the speed" />
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the units corresponding to the speed" />
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="portDescription" name="port-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Nature of the services and connectivity on this port." />
+                        <xml-property name="description" value="Nature of the services and connectivity on this port."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipmentIdentifier" name="equipment-identifier" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="CLEI or other specification for p-interface hardware." />
+                        <xml-property name="description" value="CLEI or other specification for p-interface hardware."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Role specification for p-interface hardware." />
+                        <xml-property name="description" value="Role specification for p-interface hardware."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicates the physical properties of the interface." />
+                        <xml-property name="description" value="Indicates the physical properties of the interface."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Physical interface (e.g., nic)" />
-                <xml-property name="indexedProps" value="interface-name,prov-status" />
-                <xml-property name="nameProps" value="prov-status" />
-                <xml-property name="dependentOn" value="vpls-pe,pserver,pnf" />
-                <xml-property name="container" value="p-interfaces" />
+                <xml-property name="description" value="Physical interface (e.g., nic)"/>
+                <xml-property name="indexedProps" value="interface-name,prov-status"/>
+                <xml-property name="nameProps" value="prov-status"/>
+                <xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/>
+                <xml-property name="container" value="p-interfaces"/>
+            <xml-property name="requiredProps" value="interface-name"/>
             </xml-properties>
         </java-type>
 
         <java-type name="LagInterfaces">
             <xml-properties>
-                <xml-property name="description" value="Collection of link aggregate interfaces." />
+                <xml-property name="description" value="Collection of link aggregate interfaces."/>
             </xml-properties>
-            <xml-root-element name="lag-interfaces" />
+            <xml-root-element name="lag-interfaces"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v9.LagInterface" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v9.LagInterface"/>
             </java-attributes>
         </java-type>
 
         <java-type name="LagInterface">
-            <xml-root-element name="lag-interface" />
+            <xml-root-element name="lag-interface"/>
             <java-attributes>
                 <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Name that identifies the link aggregate interface" />
+                        <xml-property name="description" value="Name that identifies the link aggregate interface"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Human friendly text regarding this interface." />
+                        <xml-property name="description" value="Human friendly text regarding this interface."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the numeric part of the speed" />
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the units corresponding to the speed" />
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ID of interface" />
+                        <xml-property name="description" value="ID of interface"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." />
+                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Link aggregate interface" />
-                <xml-property name="indexedProps" value="interface-name,interface-id,interface-role" />
-                <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf" />
-                <xml-property name="container" value="lag-interfaces" />
+                <xml-property name="description" value="Link aggregate interface"/>
+                <xml-property name="indexedProps" value="interface-name,interface-id,interface-role"/>
+                <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf"/>
+                <xml-property name="container" value="lag-interfaces"/>
+            <xml-property name="requiredProps" value="interface-name"/>
             </xml-properties>
         </java-type>
 
         <java-type name="OamNetworks">
             <xml-properties>
-                <xml-property name="description" value="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. " />
+                <xml-property name="description" value="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. "/>
             </xml-properties>
-            <xml-root-element name="oam-networks" />
+            <xml-root-element name="oam-networks"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v9.OamNetwork" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v9.OamNetwork"/>
             </java-attributes>
         </java-type>
 
         <java-type name="OamNetwork">
-            <xml-root-element name="oam-network" />
+            <xml-root-element name="oam-network"/>
             <java-attributes>
                 <xml-element java-attribute="networkUuid" name="network-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="UUID of the network. Unique across a cloud-region" />
+                        <xml-property name="description" value="UUID of the network. Unique across a cloud-region"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the network." />
+                        <xml-property name="description" value="Name of the network."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="cvlan-id" />
+                        <xml-property name="description" value="cvlan-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" />
+                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" />
+                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. " />
-                <xml-property name="nameProps" value="network-name" />
-                <xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name" />
-                <xml-property name="dependentOn" value="cloud-region" />
-                <xml-property name="container" value="oam-networks" />
+                <xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. "/>
+                <xml-property name="nameProps" value="network-name"/>
+                <xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="oam-networks"/>
+            <xml-property name="requiredProps" value="network-uuid,network-name,cvlan-tag"/>
             </xml-properties>
         </java-type>
 
         <java-type name="AvailabilityZones">
             <xml-properties>
-                <xml-property name="description" value="Collection of availability zones" />
+                <xml-property name="description" value="Collection of availability zones"/>
             </xml-properties>
-            <xml-root-element name="availability-zones" />
+            <xml-root-element name="availability-zones"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v9.AvailabilityZone" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v9.AvailabilityZone"/>
             </java-attributes>
         </java-type>
 
         <java-type name="AvailabilityZone">
-            <xml-root-element name="availability-zone" />
+            <xml-root-element name="availability-zone"/>
             <java-attributes>
                 <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the availability zone.  Unique across a cloud region" />
+                        <xml-property name="description" value="Name of the availability zone.  Unique across a cloud region"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="hypervisorType" name="hypervisor-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values." />
+                        <xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values." />
-                        <xml-property name="dbAlias" value="operational-status" />
+                        <xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values."/>
+                        <xml-property name="dbAlias" value="operational-status"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers" />
-                <xml-property name="indexedProps" value="availability-zone-name" />
-                <xml-property name="dependentOn" value="cloud-region" />
-                <xml-property name="container" value="availability-zones" />
+                <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers"/>
+                <xml-property name="indexedProps" value="availability-zone-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="availability-zones"/>
+            <xml-property name="requiredProps" value="availability-zone-name,hypervisor-type"/>
             </xml-properties>
         </java-type>
 
         <java-type name="VirtualDataCenters">
             <xml-properties>
-                <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
+                <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context"/>
             </xml-properties>
-            <xml-root-element name="virtual-data-centers" />
+            <xml-root-element name="virtual-data-centers"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v9.VirtualDataCenter" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v9.VirtualDataCenter"/>
             </java-attributes>
         </java-type>
 
         <java-type name="VirtualDataCenter">
-            <xml-root-element name="virtual-data-center" />
+            <xml-root-element name="virtual-data-center"/>
             <java-attributes>
                 <xml-element java-attribute="vdcId" name="vdc-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of the vdc" />
+                        <xml-property name="description" value="Unique ID of the vdc"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vdcName" name="vdc-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the virtual data center" />
+                        <xml-property name="description" value="Name of the virtual data center"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
-                <xml-property name="nameProps" value="vdc-name" />
-                <xml-property name="indexedProps" value="vdc-name,vdc-id" />
-                <xml-property name="container" value="virtual-data-centers" />
-                <xml-property name="namespace" value="cloud-infrastructure" />
+                <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context"/>
+                <xml-property name="nameProps" value="vdc-name"/>
+                <xml-property name="indexedProps" value="vdc-name,vdc-id"/>
+                <xml-property name="container" value="virtual-data-centers"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+            <xml-property name="requiredProps" value="vdc-id,vdc-name"/>
             </xml-properties>
         </java-type>
 
@@ -1875,1172 +1899,1185 @@
 
         <java-type name="Business">
             <xml-properties>
-                <xml-property name="description" value="Namespace for business related constructs" />
+                <xml-property name="description" value="Namespace for business related constructs"/>
             </xml-properties>
-            <xml-root-element name="business" />
+            <xml-root-element name="business"/>
             <java-attributes>
-                <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v9.Connectors" />
-                <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v9.Customers" />
+                <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v9.Connectors"/>
+                <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v9.Customers"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Connectors">
             <xml-properties>
-                <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
+                <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets"/>
             </xml-properties>
-            <xml-root-element name="connectors" />
+            <xml-root-element name="connectors"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v9.Connector" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v9.Connector"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Connector">
-            <xml-root-element name="connector" />
+            <xml-root-element name="connector"/>
             <java-attributes>
                 <xml-element java-attribute="resourceInstanceId" name="resource-instance-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id of resource instance." />
+                        <xml-property name="description" value="Unique id of resource instance."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model id for this resource or service model." />
-                        <xml-property name="dbAlias" value="model-invariant-id-local" />
-                        <xml-property name="requires" value="persona-model-version" />
-                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                        <xml-property name="requires" value="persona-model-version"/>
+                        <xml-property name="visibility" value="deployment"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                        <xml-property name="visibility" value="deployment" />
-                        <xml-property name="requires" value="persona-model-id" />
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="persona-model-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                        <xml-property name="visibility" value="internal" />
-                        <xml-property name="dbAlias" value="model-version-id-local" />
-                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="internal"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
-                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v9.Metadata" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v9.Metadata"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
-                <xml-property name="indexedProps" value="resource-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version" />
-                <xml-property name="container" value="connectors" />
-                <xml-property name="namespace" value="business" />
+                <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets"/>
+                <xml-property name="indexedProps" value="resource-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version"/>
+                <xml-property name="container" value="connectors"/>
+                <xml-property name="namespace" value="business"/>
+            <xml-property name="requiredProps" value="resource-instance-id"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Customers">
             <xml-properties>
-                <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information." />
+                <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/>
             </xml-properties>
-            <xml-root-element name="customers" />
+            <xml-root-element name="customers"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v9.Customer" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v9.Customer"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="maximumDepth" value="0" />
+                <xml-property name="maximumDepth" value="0"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Customer">
-            <xml-root-element name="customer" />
+            <xml-root-element name="customer"/>
             <java-attributes>
                 <xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer." />
+                        <xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer." />
+                        <xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="subscriberType" name="subscriber-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers." />
-                        <xml-property name="defaultValue" value="CUST" />
+                        <xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers."/>
+                        <xml-property name="defaultValue" value="CUST"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v9.ServiceSubscriptions" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v9.ServiceSubscriptions"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="customer identifiers to provide linkage back to BSS information." />
-                <xml-property name="nameProps" value="subscriber-name" />
-                <xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type" />
-                <xml-property name="searchable" value="global-customer-id,subscriber-name" />
-                <xml-property name="uniqueProps" value="global-customer-id" />
-                <xml-property name="container" value="customers" />
-                <xml-property name="namespace" value="business" />
+                <xml-property name="description" value="customer identifiers to provide linkage back to BSS information."/>
+                <xml-property name="nameProps" value="subscriber-name"/>
+                <xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type"/>
+                <xml-property name="searchable" value="global-customer-id,subscriber-name"/>
+                <xml-property name="uniqueProps" value="global-customer-id"/>
+                <xml-property name="container" value="customers"/>
+                <xml-property name="namespace" value="business"/>
+            <xml-property name="requiredProps" value="global-customer-id,subscriber-name,subscriber-type"/>
             </xml-properties>
         </java-type>
 
         <java-type name="ServiceSubscriptions">
             <xml-properties>
-                <xml-property name="description" value="Collection of objects that group service instances." />
+                <xml-property name="description" value="Collection of objects that group service instances."/>
             </xml-properties>
-            <xml-root-element name="service-subscriptions" />
+            <xml-root-element name="service-subscriptions"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v9.ServiceSubscription" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v9.ServiceSubscription"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ServiceSubscription">
-            <xml-root-element name="service-subscription" />
+            <xml-root-element name="service-subscription"/>
             <java-attributes>
                 <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP." />
+                        <xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This property will be deleted from A&amp;AI in the near future. Only stop gap solution." />
+                        <xml-property name="description" value="This property will be deleted from A&amp;AI in the near future. Only stop gap solution."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v9.ServiceInstances">
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Object that group service instances." />
-                <xml-property name="indexedProps" value="service-type" />
-                <xml-property name="dependentOn" value="customer" />
-                <xml-property name="container" value="service-subscriptions" />
-                <xml-property name="crossEntityReference" value="service-instance,service-type" />
+                <xml-property name="description" value="Object that group service instances."/>
+                <xml-property name="indexedProps" value="service-type"/>
+                <xml-property name="dependentOn" value="customer"/>
+                <xml-property name="container" value="service-subscriptions"/>
+                <xml-property name="crossEntityReference" value="service-instance,service-type"/>
+            <xml-property name="requiredProps" value="service-type"/>
             </xml-properties>
         </java-type>
 
         <java-type name="ServiceInstances">
             <xml-properties>
-                <xml-property name="description" value="Collection of service instances" />
+                <xml-property name="description" value="Collection of service instances"/>
             </xml-properties>
-            <xml-root-element name="service-instances" />
+            <xml-root-element name="service-instances"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v9.ServiceInstance" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v9.ServiceInstance"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ServiceInstance">
-            <xml-root-element name="service-instance" />
+            <xml-root-element name="service-instance"/>
             <java-attributes>
                 <xml-element java-attribute="serviceInstanceId" name="service-instance-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Uniquely identifies this instance of a service" />
+                        <xml-property name="description" value="Uniquely identifies this instance of a service"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="serviceInstanceName" name="service-instance-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This field will store a name assigned to the service-instance." />
+                        <xml-property name="description" value="This field will store a name assigned to the service-instance."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model id for this resource or service model." />
-                        <xml-property name="dbAlias" value="model-invariant-id-local" />
-                        <xml-property name="requires" value="persona-model-version" />
-                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                        <xml-property name="requires" value="persona-model-version"/>
+                        <xml-property name="visibility" value="deployment"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                        <xml-property name="visibility" value="deployment" />
-                        <xml-property name="requires" value="persona-model-id" />
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="persona-model-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                        <xml-property name="visibility" value="internal" />
-                        <xml-property name="dbAlias" value="model-version-id-local" />
-                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="internal"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="bandwidthTotal" name="bandwidth-total" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicates the total bandwidth to be used for this service." />
+                        <xml-property name="description" value="Indicates the total bandwidth to be used for this service."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device." />
+                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device." />
+                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device." />
+                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device." />
+                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vhnPortalUrl" name="vhn-portal-url" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL customers will use to access the vHN Portal." />
+                        <xml-property name="description" value="URL customers will use to access the vHN Portal."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="An identifier that customers assign to the location where this service is being used." />
+                        <xml-property name="description" value="An identifier that customers assign to the location where this service is being used."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Path to the controller object." />
+                        <xml-property name="description" value="Path to the controller object."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this service." />
+                        <xml-property name="description" value="Orchestration status of this service."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
-                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v9.Metadata" />
-                <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v9.AllottedResources" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v9.Metadata"/>
+                <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v9.AllottedResources"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Instance of a service" />
-                <xml-property name="indexedProps" value="service-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status" />
-                <xml-property name="nameProps" value="service-instance-name" />
-                <xml-property name="searchable" value="service-instance-id,service-instance-name" />
-                <xml-property name="uniqueProps" value="service-instance-id" />
-                <xml-property name="dependentOn" value="service-subscription" />
-                <xml-property name="container" value="service-instances" />
+                <xml-property name="description" value="Instance of a service"/>
+                <xml-property name="indexedProps" value="service-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status"/>
+                <xml-property name="nameProps" value="service-instance-name"/>
+                <xml-property name="searchable" value="service-instance-id,service-instance-name"/>
+                <xml-property name="uniqueProps" value="service-instance-id"/>
+                <xml-property name="dependentOn" value="service-subscription"/>
+                <xml-property name="container" value="service-instances"/>
+            <xml-property name="requiredProps" value="service-instance-id"/>
             </xml-properties>
         </java-type>
 
         <java-type name="ServiceDesignAndCreation">
             <xml-properties>
-                <xml-property name="description" value="Namespace for objects managed by ASDC" />
+                <xml-property name="description" value="Namespace for objects managed by ASDC"/>
             </xml-properties>
-            <xml-root-element name="service-design-and-creation" />
+            <xml-root-element name="service-design-and-creation"/>
             <java-attributes>
-                <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v9.VnfImages" />
-                <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v9.Services" />
-                <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v9.ServiceCapabilities" />
-                <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v9.Models" />
-                <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v9.NamedQueries" />
+                <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v9.VnfImages"/>
+                <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v9.Services"/>
+                <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v9.ServiceCapabilities"/>
+                <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v9.Models"/>
+                <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v9.NamedQueries"/>
             </java-attributes>
         </java-type>
 
         <java-type name="VnfImages">
             <xml-properties>
-                <xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
+                <xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge."/>
             </xml-properties>
-            <xml-root-element name="vnf-images" />
+            <xml-root-element name="vnf-images"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v9.VnfImage" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v9.VnfImage"/>
             </java-attributes>
         </java-type>
 
         <java-type name="VnfImage">
-            <xml-root-element name="vnf-image" />
+            <xml-root-element name="vnf-image"/>
             <java-attributes>
                 <xml-element java-attribute="vnfImageUuid" name="vnf-image-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of this asset" />
+                        <xml-property name="description" value="Unique ID of this asset"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="application" name="application" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The application that the image instantiates." />
+                        <xml-property name="description" value="The application that the image instantiates."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="applicationVendor" name="application-vendor" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The vendor of the application." />
+                        <xml-property name="description" value="The vendor of the application."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The version of the application." />
+                        <xml-property name="description" value="The version of the application."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
-                <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version" />
-                <xml-property name="uniqueProps" value="vnf-image-uuid" />
-                <xml-property name="container" value="vnf-images" />
-                <xml-property name="namespace" value="service-design-and-creation" />
+                <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge."/>
+                <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version"/>
+                <xml-property name="uniqueProps" value="vnf-image-uuid"/>
+                <xml-property name="container" value="vnf-images"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+            <xml-property name="requiredProps" value="vnf-image-uuid,application,application-vendor"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Services">
             <xml-properties>
-                <xml-property name="description" value="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC." />
+                <xml-property name="description" value="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC."/>
             </xml-properties>
-            <xml-root-element name="services" />
+            <xml-root-element name="services"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v9.Service" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v9.Service"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Service">
-            <xml-root-element name="service" />
+            <xml-root-element name="service"/>
             <java-attributes>
                 <xml-element java-attribute="serviceId" name="service-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." />
+                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="serviceDescription" name="service-description" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Description of the service" />
+                        <xml-property name="description" value="Description of the service"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="serviceSelflink" name="service-selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="serviceVersion" name="service-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="service version" />
+                        <xml-property name="description" value="service version"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services." />
-                <xml-property name="indexedProps" value="service-description,service-id" />
-                <xml-property name="container" value="services" />
-                <xml-property name="namespace" value="service-design-and-creation" />
+                <xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services."/>
+                <xml-property name="indexedProps" value="service-description,service-id"/>
+                <xml-property name="container" value="services"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+            <xml-property name="requiredProps" value="service-id,service-description"/>
             </xml-properties>
         </java-type>
 
         <java-type name="ServiceCapabilities">
             <xml-properties>
-                <xml-property name="description" value="Collection of service capabilities." />
+                <xml-property name="description" value="Collection of service capabilities."/>
             </xml-properties>
-            <xml-root-element name="service-capabilities" />
+            <xml-root-element name="service-capabilities"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v9.ServiceCapability" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v9.ServiceCapability"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ServiceCapability">
-            <xml-root-element name="service-capability" />
+            <xml-root-element name="service-capability"/>
             <java-attributes>
                 <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." />
+                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this." />
-                <xml-property name="indexedProps" value="service-type,vnf-type" />
-                <xml-property name="container" value="service-capabilities" />
-                <xml-property name="namespace" value="service-design-and-creation" />
+                <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this."/>
+                <xml-property name="indexedProps" value="service-type,vnf-type"/>
+                <xml-property name="container" value="service-capabilities"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+            <xml-property name="requiredProps" value="service-type,vnf-type"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Network">
             <xml-properties>
-                <xml-property name="description" value="Namespace for network inventory resources." />
+                <xml-property name="description" value="Namespace for network inventory resources."/>
             </xml-properties>
-            <xml-root-element name="network" />
+            <xml-root-element name="network"/>
             <java-attributes>
-                <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v9.LogicalLinks" />
-                <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v9.SitePairSets" />
-                <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v9.VpnBindings" />
-                <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v9.VplsPes" />
-                <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v9.MulticastConfigurations" />
-                <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v9.Vces" />
-                <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v9.Vnfcs" />
-                <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v9.L3Networks" />
-                <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v9.NetworkPolicies" />
-                <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v9.GenericVnfs" />
-                <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v9.LagLinks" />
-                <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v9.Newvces" />
-                <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v9.Pnfs" />
-                <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v9.PhysicalLinks" />
-                <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v9.IpsecConfigurations" />
-                <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v9.RouteTableReferences" />
-                <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v9.InstanceGroups" />
-                <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v9.Zones" />
+                <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v9.LogicalLinks"/>
+                <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v9.SitePairSets"/>
+                <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v9.VpnBindings"/>
+                <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v9.VplsPes"/>
+                <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v9.MulticastConfigurations"/>
+                <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v9.Vces"/>
+                <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v9.Vnfcs"/>
+                <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v9.L3Networks"/>
+                <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v9.NetworkPolicies"/>
+                <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v9.GenericVnfs"/>
+                <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v9.LagLinks"/>
+                <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v9.Newvces"/>
+                <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v9.Pnfs"/>
+                <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v9.PhysicalLinks"/>
+                <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v9.IpsecConfigurations"/>
+                <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v9.RouteTableReferences"/>
+                <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v9.InstanceGroups"/>
+                <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v9.Zones"/>
             </java-attributes>
         </java-type>
 
         <java-type name="LogicalLinks">
             <xml-properties>
-                <xml-property name="description" value="Collection of logical connections" />
+                <xml-property name="description" value="Collection of logical connections"/>
             </xml-properties>
-            <xml-root-element name="logical-links" />
+            <xml-root-element name="logical-links"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v9.LogicalLink" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v9.LogicalLink"/>
             </java-attributes>
         </java-type>
 
         <java-type name="LogicalLink">
-            <xml-root-element name="logical-link" />
+            <xml-root-element name="logical-link"/>
             <java-attributes>
                 <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ" />
+                        <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="linkType" name="link-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of logical link, e.g., evc" />
+                        <xml-property name="description" value="Type of logical link, e.g., evc"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the numeric part of the speed" />
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the units corresponding to the speed" />
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="v4, v6, or ds for dual stack" />
+                        <xml-property name="description" value="v4, v6, or ds for dual stack"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="For example, static or BGP" />
+                        <xml-property name="description" value="For example, static or BGP"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model id for this resource or service model." />
-                        <xml-property name="dbAlias" value="model-invariant-id-local" />
-                        <xml-property name="requires" value="persona-model-version" />
-                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                        <xml-property name="requires" value="persona-model-version"/>
+                        <xml-property name="visibility" value="deployment"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                        <xml-property name="visibility" value="deployment" />
-                        <xml-property name="requires" value="persona-model-id" />
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="persona-model-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                        <xml-property name="visibility" value="internal" />
-                        <xml-property name="dbAlias" value="model-version-id-local" />
-                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="internal"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indication of operational status of the logical link." />
+                        <xml-property name="description" value="Indication of operational status of the logical link."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="linkRole" name="link-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indication of the network use of the logical link." />
+                        <xml-property name="description" value="Indication of the network use of the logical link."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="linkName2" name="link-name2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Alias or alternate name (CLCI or D1 name)." />
+                        <xml-property name="description" value="Alias or alternate name (CLCI or D1 name)."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="linkId" name="link-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="UUID of the logical-link, SDNC generates this." />
+                        <xml-property name="description" value="UUID of the logical-link, SDNC generates this."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Circuit id" />
+                        <xml-property name="description" value="Circuit id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Reason for this entity, role it is playing" />
+                        <xml-property name="description" value="Reason for this entity, role it is playing"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" />
-                <xml-property name="indexedProps" value="link-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose" />
-                <xml-property name="uniqueProps" value="link-id" />
-                <xml-property name="container" value="logical-links" />
-                <xml-property name="namespace" value="network" />
-                <xml-property name="searchable" value="link-name" />
+                <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points"/>
+                <xml-property name="indexedProps" value="link-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose"/>
+                <xml-property name="uniqueProps" value="link-id"/>
+                <xml-property name="container" value="logical-links"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="searchable" value="link-name"/>
+            <xml-property name="requiredProps" value="link-name,link-type"/>
             </xml-properties>
         </java-type>
 
         <java-type name="SitePairSets">
             <xml-properties>
-                <xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf" />
+                <xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf"/>
             </xml-properties>
-            <xml-root-element name="site-pair-sets" />
+            <xml-root-element name="site-pair-sets"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v9.SitePairSet" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v9.SitePairSet"/>
             </java-attributes>
         </java-type>
 
         <java-type name="SitePairSet">
-            <xml-root-element name="site-pair-set" />
+            <xml-root-element name="site-pair-set"/>
             <java-attributes>
                 <xml-element java-attribute="sitePairSetId" name="site-pair-set-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id of site pair set." />
+                        <xml-property name="description" value="Unique id of site pair set."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v9.RoutingInstances" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v9.RoutingInstances"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Set of instances for probes used to measure service level agreements" />
-                <xml-property name="indexedProps" value="site-pair-set-id" />
-                <xml-property name="uniqueProps" value="site-pair-set-id" />
-                <xml-property name="container" value="site-pair-sets" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="Set of instances for probes used to measure service level agreements"/>
+                <xml-property name="indexedProps" value="site-pair-set-id"/>
+                <xml-property name="uniqueProps" value="site-pair-set-id"/>
+                <xml-property name="container" value="site-pair-sets"/>
+                <xml-property name="namespace" value="network"/>
+            <xml-property name="requiredProps" value="site-pair-set-id"/>
             </xml-properties>
         </java-type>
 
         <java-type name="RoutingInstances">
             <xml-properties>
-                <xml-property name="description" value="set of probes related to generic-vnf routing instance" />
+                <xml-property name="description" value="set of probes related to generic-vnf routing instance"/>
             </xml-properties>
-            <xml-root-element name="routing-instances" />
+            <xml-root-element name="routing-instances"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v9.RoutingInstance" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v9.RoutingInstance"/>
             </java-attributes>
         </java-type>
 
         <java-type name="RoutingInstance">
-            <xml-root-element name="routing-instance" />
+            <xml-root-element name="routing-instance"/>
             <java-attributes>
                 <xml-element java-attribute="routingInstanceId" name="routing-instance-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id of routing instance" />
+                        <xml-property name="description" value="Unique id of routing instance"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="rpmOwner" name="rpm-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="rpm owner" />
+                        <xml-property name="description" value="rpm owner"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v9.SitePairs" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v9.SitePairs"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="routing-instance-id" />
-                <xml-property name="uniqueProps" value="routing-instance-id" />
-                <xml-property name="dependentOn" value="site-pair-set" />
-                <xml-property name="container" value="routing-instances" />
+                <xml-property name="indexedProps" value="routing-instance-id"/>
+                <xml-property name="uniqueProps" value="routing-instance-id"/>
+                <xml-property name="dependentOn" value="site-pair-set"/>
+                <xml-property name="container" value="routing-instances"/>
             </xml-properties>
         </java-type>
 
         <java-type name="SitePairs">
             <xml-properties>
-                <xml-property name="description" value="probe within a set" />
+                <xml-property name="description" value="probe within a set"/>
             </xml-properties>
-            <xml-root-element name="site-pairs" />
+            <xml-root-element name="site-pairs"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v9.SitePair" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v9.SitePair"/>
             </java-attributes>
         </java-type>
 
         <java-type name="SitePair">
-            <xml-root-element name="site-pair" />
+            <xml-root-element name="site-pair"/>
             <java-attributes>
                 <xml-element java-attribute="sitePairId" name="site-pair-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="unique identifier of probe" />
+                        <xml-property name="description" value="unique identifier of probe"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="sourceIp" name="source-ip" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Prefix address" />
+                        <xml-property name="description" value="Prefix address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="destinationIp" name="destination-ip" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Prefix address" />
+                        <xml-property name="description" value="Prefix address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ip version, v4, v6" />
+                        <xml-property name="description" value="ip version, v4, v6"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="destinationHostname" name="destination-hostname" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against." />
+                        <xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="destinationEquipType" name="destination-equip-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The type of destinatination equipment. Could be Router, etc." />
+                        <xml-property name="description" value="The type of destinatination equipment. Could be Router, etc."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v9.ClassesOfService" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v9.ClassesOfService"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="site-pair-id" />
-                <xml-property name="uniqueProps" value="site-pair-id" />
-                <xml-property name="dependentOn" value="routing-instance" />
-                <xml-property name="container" value="site-pairs" />
+                <xml-property name="indexedProps" value="site-pair-id"/>
+                <xml-property name="uniqueProps" value="site-pair-id"/>
+                <xml-property name="dependentOn" value="routing-instance"/>
+                <xml-property name="container" value="site-pairs"/>
             </xml-properties>
         </java-type>
 
         <java-type name="ClassesOfService">
             <xml-properties>
-                <xml-property name="description" value="class-of-service of probe" />
+                <xml-property name="description" value="class-of-service of probe"/>
             </xml-properties>
-            <xml-root-element name="classes-of-service" />
+            <xml-root-element name="classes-of-service"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v9.ClassOfService" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v9.ClassOfService"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ClassOfService">
-            <xml-root-element name="class-of-service" />
+            <xml-root-element name="class-of-service"/>
             <java-attributes>
                 <xml-element java-attribute="cos" name="cos" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="unique identifier of probe" />
+                        <xml-property name="description" value="unique identifier of probe"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="probeId" name="probe-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="identifier of probe" />
+                        <xml-property name="description" value="identifier of probe"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="probeType" name="probe-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="type of probe" />
+                        <xml-property name="description" value="type of probe"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="cos" />
-                <xml-property name="dependentOn" value="site-pair" />
-                <xml-property name="container" value="classes-of-service" />
+                <xml-property name="indexedProps" value="cos"/>
+                <xml-property name="dependentOn" value="site-pair"/>
+                <xml-property name="container" value="classes-of-service"/>
             </xml-properties>
         </java-type>
 
         <java-type name="VpnBindings">
-            <xml-root-element name="vpn-bindings" />
+            <xml-root-element name="vpn-bindings"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v9.VpnBinding" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v9.VpnBinding"/>
             </java-attributes>
         </java-type>
 
         <java-type name="VpnBinding">
-            <xml-root-element name="vpn-binding" />
+            <xml-root-element name="vpn-binding"/>
             <java-attributes>
                 <xml-element java-attribute="vpnId" name="vpn-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="VPN ID, globally unique within A&amp;AI" />
+                        <xml-property name="description" value="VPN ID, globally unique within A&amp;AI"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vpnName" name="vpn-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="VPN Name" />
+                        <xml-property name="description" value="VPN Name"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="globalRouteTarget" name="global-route-target" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Number used to identify a VPN, globally unique in the network" />
-                        <xml-property name="dataLink" value="./route-targets/route-target/{global-route-target}/{route-target-role}" />
+                        <xml-property name="description" value="Number used to identify a VPN, globally unique in the network"/>
+                        <xml-property name="dataLink" value="./route-targets/route-target/{global-route-target}/{route-target-role}"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vpnPlatform" name="vpn-platform" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility" />
+                        <xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values" />
+                        <xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network." />
+                        <xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="routeTargetRole" name="route-target-role" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Role assigned to this route target" />
-                        <xml-property name="dataLink" value="./route-targets/route-target/{global-route-target}/{route-target-role}" />
-                        <xml-property name="defaultValue" value="BOTH" />
+                        <xml-property name="description" value="Role assigned to this route target"/>
+                        <xml-property name="dataLink" value="./route-targets/route-target/{global-route-target}/{route-target-role}"/>
+                        <xml-property name="defaultValue" value="BOTH"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList">
                     <xml-properties>
-                        <xml-property name="description" value="l3-networks relate to vpn-bindings" />
+                        <xml-property name="description" value="l3-networks relate to vpn-bindings"/>
                     </xml-properties>
                 </xml-element>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="VPN binding" />
-                <xml-property name="nameProps" value="vpn-name,vpn-type" />
-                <xml-property name="indexedProps" value="vpn-name,vpn-id,global-route-target,vpn-type" />
-                <xml-property name="searchable" value="vpn-id,vpn-name" />
-                <xml-property name="uniqueProps" value="vpn-id" />
-                <xml-property name="container" value="vpn-bindings" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="VPN binding"/>
+                <xml-property name="nameProps" value="vpn-name,vpn-type"/>
+                <xml-property name="indexedProps" value="vpn-name,vpn-id,global-route-target,vpn-type"/>
+                <xml-property name="searchable" value="vpn-id,vpn-name"/>
+                <xml-property name="uniqueProps" value="vpn-id"/>
+                <xml-property name="container" value="vpn-bindings"/>
+                <xml-property name="namespace" value="network"/>
+            <xml-property name="requiredProps" value="vpn-id,vpn-name,global-route-target,route-target-role"/>
             </xml-properties>
         </java-type>
 
         <java-type name="VplsPes">
             <xml-properties>
-                <xml-property name="description" value="Collection of VPLS Provider Edge routers" />
+                <xml-property name="description" value="Collection of VPLS Provider Edge routers"/>
             </xml-properties>
-            <xml-root-element name="vpls-pes" />
+            <xml-root-element name="vpls-pes"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v9.VplsPe" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v9.VplsPe"/>
             </java-attributes>
         </java-type>
 
         <java-type name="VplsPe">
-            <xml-root-element name="vpls-pe" />
+            <xml-root-element name="vpls-pe"/>
             <java-attributes>
-                <xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true" />
+                <xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true"/>
                 <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address)." />
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address)."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE." />
+                        <xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Temporary location for stag to get to VCE" />
+                        <xml-property name="description" value="Temporary location for stag to get to VCE"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
-                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v9.PInterfaces" />
-                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v9.LagInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v9.PInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v9.LagInterfaces"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="VPLS Provider Edge routers." />
-                <xml-property name="indexedProps" value="prov-status,equipment-name" />
-                <xml-property name="container" value="vpls-pes" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="VPLS Provider Edge routers."/>
+                <xml-property name="indexedProps" value="prov-status,equipment-name"/>
+                <xml-property name="container" value="vpls-pes"/>
+                <xml-property name="namespace" value="network"/>
+            <xml-property name="requiredProps" value="equipment-name"/>
             </xml-properties>
         </java-type>
 
         <java-type name="MulticastConfigurations">
             <xml-properties>
-                <xml-property name="description" value="multicast configuration of generic-vnf ip-address" />
+                <xml-property name="description" value="multicast configuration of generic-vnf ip-address"/>
             </xml-properties>
-            <xml-root-element name="multicast-configurations" />
+            <xml-root-element name="multicast-configurations"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v9.MulticastConfiguration" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v9.MulticastConfiguration"/>
             </java-attributes>
         </java-type>
 
         <java-type name="MulticastConfiguration">
-            <xml-root-element name="multicast-configuration" />
+            <xml-root-element name="multicast-configuration"/>
             <java-attributes>
                 <xml-element java-attribute="multicastConfigurationId" name="multicast-configuration-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id of multicast configuration." />
+                        <xml-property name="description" value="Unique id of multicast configuration."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="multicastProtocol" name="multicast-protocol" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="protocol of multicast configuration" />
+                        <xml-property name="description" value="protocol of multicast configuration"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="rpType" name="rp-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="rp type of multicast configuration" />
+                        <xml-property name="description" value="rp type of multicast configuration"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="multicast-configuration-id" />
-                <xml-property name="uniqueProps" value="multicast-configuration-id" />
-                <xml-property name="container" value="multicast-configurations" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="indexedProps" value="multicast-configuration-id"/>
+                <xml-property name="uniqueProps" value="multicast-configuration-id"/>
+                <xml-property name="container" value="multicast-configurations"/>
+                <xml-property name="namespace" value="network"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Vces">
             <xml-properties>
-                <xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated." />
+                <xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated."/>
             </xml-properties>
-            <xml-root-element name="vces" />
+            <xml-root-element name="vces"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v9.Vce" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v9.Vce"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Vce">
-            <xml-root-element name="vce" />
+            <xml-root-element name="vce"/>
             <java-attributes>
                 <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of VNF." />
+                        <xml-property name="description" value="Name of VNF."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Alternate name of VNF." />
+                        <xml-property name="description" value="Alternate name of VNF."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED." />
+                        <xml-property name="description" value="Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" />
+                        <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator for whether the resource is considered operational" />
-                        <xml-property name="dbAlias" value="operational-status" />
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                        <xml-property name="dbAlias" value="operational-status"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="OBSOLETE -  do not use" />
+                        <xml-property name="description" value="OBSOLETE -  do not use"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Network role being played by this VNF" />
+                        <xml-property name="description" value="Network role being played by this VNF"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of VPE connected to this VCE." />
+                        <xml-property name="description" value="Unique ID of VPE connected to this VCE."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64." />
+                        <xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE." />
+                        <xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Loopback0 address" />
+                        <xml-property name="description" value="Loopback0 address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="OBSOLETE -  see child relationships" />
+                        <xml-property name="description" value="OBSOLETE -  see child relationships"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v9.PortGroups" />
-                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v9.Licenses" />
-                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v9.Entitlements" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v9.PortGroups"/>
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v9.Licenses"/>
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v9.Entitlements"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated." />
-                <xml-property name="nameProps" value="vnf-name" />
-                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id" />
-                <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" />
-                <xml-property name="uniqueProps" value="vnf-id" />
-                <xml-property name="container" value="vces" />
-                <xml-property name="namespace" value="network" />
-                <xml-property name="extends" value="vnf" />
+                <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated."/>
+                <xml-property name="nameProps" value="vnf-name"/>
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/>
+                <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
+                <xml-property name="uniqueProps" value="vnf-id"/>
+                <xml-property name="container" value="vces"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="extends" value="vnf"/>
+            <xml-property name="requiredProps" value="vnf-id,vnf-name,vnf-type"/>
             </xml-properties>
         </java-type>
 
         <java-type name="PortGroups">
-            <xml-root-element name="port-groups" />
+            <xml-root-element name="port-groups"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v9.PortGroup" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v9.PortGroup"/>
             </java-attributes>
         </java-type>
 
         <java-type name="PortGroup">
-            <xml-root-element name="port-group" />
+            <xml-root-element name="port-group"/>
             <java-attributes>
                 <xml-element java-attribute="interfaceId" name="interface-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of the interface" />
+                        <xml-property name="description" value="Unique ID of the interface"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron network id of this Interface" />
+                        <xml-property name="description" value="Neutron network id of this Interface"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="neutronNetworkName" name="neutron-network-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron network name of this Interface" />
+                        <xml-property name="description" value="Neutron network name of this Interface"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." />
+                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="portGroupId" name="port-group-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID for port group in vmware" />
+                        <xml-property name="description" value="Unique ID for port group in vmware"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="portGroupName" name="port-group-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Likely to duplicate value of neutron network name" />
+                        <xml-property name="description" value="Likely to duplicate value of neutron network name"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="switchName" name="switch-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)" />
+                        <xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v9.CvlanTags" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v9.CvlanTags"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Used to capture the network interfaces of this VCE" />
-                <xml-property name="nameProps" value="port-group-name" />
-                <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name" />
-                <xml-property name="dependentOn" value="vce" />
-                <xml-property name="container" value="port-groups" />
+                <xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
+                <xml-property name="nameProps" value="port-group-name"/>
+                <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name"/>
+                <xml-property name="dependentOn" value="vce"/>
+                <xml-property name="container" value="port-groups"/>
+            <xml-property name="requiredProps" value="interface-id,orchestration-status"/>
             </xml-properties>
         </java-type>
 
         <java-type name="CvlanTags">
-            <xml-root-element name="cvlan-tags" />
+            <xml-root-element name="cvlan-tags"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v9.CvlanTagEntry" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v9.CvlanTagEntry"/>
             </java-attributes>
         </java-type>
 
         <java-type name="CvlanTagEntry">
-            <xml-root-element name="cvlan-tag-entry" />
+            <xml-root-element name="cvlan-tag-entry"/>
             <java-attributes>
                 <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="See mis-na-virtualization-platform.yang" />
+                        <xml-property name="description" value="See mis-na-virtualization-platform.yang"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="dependentOn" value="port-group" />
-                <xml-property name="indexedProps" value="cvlan-tag" />
-                <xml-property name="container" value="cvlan-tags" />
+                <xml-property name="dependentOn" value="port-group"/>
+                <xml-property name="indexedProps" value="cvlan-tag"/>
+                <xml-property name="container" value="cvlan-tags"/>
             </xml-properties>
         </java-type>
 
@@ -3048,2208 +3085,2236 @@
 
         <java-type name="Vnfcs">
             <xml-properties>
-                <xml-property name="description" value="virtual network components associated with a vserver from application controller." />
+                <xml-property name="description" value="virtual network components associated with a vserver from application controller."/>
             </xml-properties>
-            <xml-root-element name="vnfcs" />
+            <xml-root-element name="vnfcs"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v9.Vnfc" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v9.Vnfc"/>
             </java-attributes>
         </java-type>
 
                <java-type name="Vnfc">
-                       <xml-root-element name="vnfc" />
+                       <xml-root-element name="vnfc"/>
                        <java-attributes>
                                <xml-element java-attribute="vnfcName" name="vnfc-name" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique ID of vnfc." />
+                                               <xml-property name="description" value="Unique ID of vnfc."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vnfcFunctionCode" name="vnfc-function-code" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="function code" />
-                                       <xml-property name="dbAlias" value="nfc-naming-code" />
+                                               <xml-property name="description" value="function code"/>
+                                       <xml-property name="dbAlias" value="nfc-naming-code"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vnfcType" name="vnfc-type" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="type" /><xml-property name="dbAlias" value="nfc-function" />
+                                               <xml-property name="description" value="type"/>
+                        <xml-property name="dbAlias" value="nfc-function"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="prov status of this vnfc" />
+                                               <xml-property name="description" value="prov status of this vnfc"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Orchestration status of this VNF, mastered by APP-C" />
+                                               <xml-property name="description" value="Orchestration status of this VNF, mastered by APP-C"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Oam V4 vip address of this vnfc" />
+                                               <xml-property name="description" value="Oam V4 vip address of this vnfc"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                               <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
                                        <xml-properties>
                                                <xml-property name="defaultValue" value="false"/>
-                                               <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+                                               <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean">
+                               <xml-element default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" type="java.lang.Boolean">
                                        <xml-properties>
                                                <xml-property name="defaultValue" value="false"/>
-                                               <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node" />
+                                               <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="groupNotation" name="group-notation" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Group notation of VNFC" />
+                                               <xml-property name="description" value="Group notation of VNFC"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" />
-                               <xml-property name="searchable" value="vnfc-name" />
-                               <xml-property name="container" value="vnfcs" />
-                               <xml-property name="namespace" value="network" />
+                               <xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation"/>
+                               <xml-property name="searchable" value="vnfc-name"/>
+                               <xml-property name="container" value="vnfcs"/>
+                               <xml-property name="namespace" value="network"/>
                        </xml-properties>
                </java-type>
 
         <java-type name="L3Networks">
-            <xml-root-element name="l3-networks" />
+            <xml-root-element name="l3-networks"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v9.L3Network" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v9.L3Network"/>
             </java-attributes>
         </java-type>
 
         <java-type name="L3Network">
-            <xml-root-element name="l3-network" />
+            <xml-root-element name="l3-network"/>
             <java-attributes>
                 <xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Network ID, should be uuid. Unique across A&amp;AI." />
+                        <xml-property name="description" value="Network ID, should be uuid. Unique across A&amp;AI."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the network, governed by some naming convention.." />
+                        <xml-property name="description" value="Name of the network, governed by some naming convention.."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="networkType" name="network-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of the network - who defines these values?" />
+                        <xml-property name="description" value="Type of the network - who defines these values?"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="networkRole" name="network-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Role the network plans - who defines these values?" />
+                        <xml-property name="description" value="Role the network plans - who defines these values?"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="networkTechnology" name="network-technology" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Network technology - who defines these values?" />
+                        <xml-property name="description" value="Network technology - who defines these values?"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron network id of this Interface" />
+                        <xml-property name="description" value="Neutron network id of this Interface"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" required="true" java-attribute="isBoundToVpn" name="is-bound-to-vpn" type="java.lang.Boolean">
+                <xml-element default-value="false" java-attribute="isBoundToVpn" name="is-bound-to-vpn" required="true" type="java.lang.Boolean">
                     <xml-properties>
                         <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="Set to true if bound to VPN" />
+                        <xml-property name="description" value="Set to true if bound to VPN"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED" />
+                        <xml-property name="description" value="Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="networkRoleInstance" name="network-role-instance" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="network role instance" />
+                        <xml-property name="description" value="network role instance"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="contrailNetworkFqdn" name="contrail-network-fqdn" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Contrail FQDN for the network" />
+                        <xml-property name="description" value="Contrail FQDN for the network"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model id for this resource or service model." />
-                        <xml-property name="dbAlias" value="model-invariant-id-local" />
-                        <xml-property name="requires" value="persona-model-version" />
-                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                        <xml-property name="requires" value="persona-model-version"/>
+                        <xml-property name="visibility" value="deployment"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                        <xml-property name="visibility" value="deployment" />
-                        <xml-property name="requires" value="persona-model-id" />
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="persona-model-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                        <xml-property name="visibility" value="internal" />
-                        <xml-property name="dbAlias" value="model-version-id-local" />
-                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="internal"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="personaModelCustomizationId" name="persona-model-customization-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." />
-                        <xml-property name="dbAlias" value="model-customization-id" />
+                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service."/>
+                        <xml-property name="dbAlias" value="model-customization-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="physicalNetworkName" name="physical-network-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name associated with the physical network." />
+                        <xml-property name="description" value="Name associated with the physical network."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="isProviderNetwork" name="is-provider-network" required="true" type="java.lang.Boolean">
                     <xml-properties>
                         <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="boolean indicatating whether or not network is a provider network." />
+                        <xml-property name="description" value="boolean indicatating whether or not network is a provider network."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="isSharedNetwork" name="is-shared-network" required="true" type="java.lang.Boolean">
                     <xml-properties>
                         <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="boolean indicatating whether or not network is a shared network." />
+                        <xml-property name="description" value="boolean indicatating whether or not network is a shared network."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="isExternalNetwork" name="is-external-network" required="true" type="java.lang.Boolean">
                     <xml-properties>
                         <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="boolean indicatating whether or not network is an external network." />
+                        <xml-property name="description" value="boolean indicatating whether or not network is an external network."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Path to the controller object." />
+                        <xml-property name="description" value="Path to the controller object."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v9.Subnets" />
-                <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v9.CtagAssignments" />
-                <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v9.SegmentationAssignments" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" >
+                <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v9.Subnets"/>
+                <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v9.CtagAssignments"/>
+                <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v9.SegmentationAssignments"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList">
                     <xml-properties>
-                        <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding" />
+                        <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding"/>
                     </xml-properties>
                 </xml-element>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Generic network definition" />
-                <xml-property name="nameProps" value="network-name" />
-                <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn,network-role" />
-                <xml-property name="searchable" value="network-id,network-name" />
-                <xml-property name="uniqueProps" value="network-id" />
-                <xml-property name="container" value="l3-networks" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="Generic network definition"/>
+                <xml-property name="nameProps" value="network-name"/>
+                <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
+                <xml-property name="searchable" value="network-id,network-name"/>
+                <xml-property name="uniqueProps" value="network-id"/>
+                <xml-property name="container" value="l3-networks"/>
+                <xml-property name="namespace" value="network"/>
+            <xml-property name="requiredProps" value="network-id,network-name,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network"/>
             </xml-properties>
         </java-type>
         <java-type name="NetworkPolicies">
-            <xml-root-element name="network-policies" />
+            <xml-root-element name="network-policies"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v9.NetworkPolicy" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v9.NetworkPolicy"/>
             </java-attributes>
         </java-type>
         <java-type name="NetworkPolicy">
-            <xml-root-element name="network-policy" />
+            <xml-root-element name="network-policy"/>
             <java-attributes>
                 <xml-element java-attribute="networkPolicyId" name="network-policy-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="UUID representing unique key to this instance" />
+                        <xml-property name="description" value="UUID representing unique key to this instance"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="networkPolicyFqdn" name="network-policy-fqdn" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Contrail FQDN for the policy" />
+                        <xml-property name="description" value="Contrail FQDN for the policy"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ID for the openStack Heat instance" />
+                        <xml-property name="description" value="ID for the openStack Heat instance"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="nameProps" value="network-policy-fqdn" />
-                <xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn" />
-                <xml-property name="searchable" value="network-policy-id,network-policy-fqdn" />
-                <xml-property name="uniqueProps" value="network-policy-id" />
-                <xml-property name="container" value="network-policies" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="nameProps" value="network-policy-fqdn"/>
+                <xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn"/>
+                <xml-property name="searchable" value="network-policy-id,network-policy-fqdn"/>
+                <xml-property name="uniqueProps" value="network-policy-id"/>
+                <xml-property name="container" value="network-policies"/>
+                <xml-property name="namespace" value="network"/>
             </xml-properties>
         </java-type>
         <java-type name="CtagAssignments">
-            <xml-root-element name="ctag-assignments" />
+            <xml-root-element name="ctag-assignments"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v9.CtagAssignment" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v9.CtagAssignment"/>
             </java-attributes>
         </java-type>
 
         <java-type name="CtagAssignment">
-            <xml-root-element name="ctag-assignment" />
+            <xml-root-element name="ctag-assignment"/>
             <java-attributes>
                 <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" required="true" type="java.lang.Long" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="id." />
+                        <xml-property name="description" value="id."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="vlan-id-inner" />
-                <xml-property name="dependentOn" value="l3-network" />
-                <xml-property name="container" value="ctag-assignments" />
+                <xml-property name="indexedProps" value="vlan-id-inner"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="ctag-assignments"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Subnets">
-            <xml-root-element name="subnets" />
+            <xml-root-element name="subnets"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v9.Subnet" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v9.Subnet"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Subnet">
-            <xml-root-element name="subnet" />
+            <xml-root-element name="subnet"/>
             <java-attributes>
                 <xml-element java-attribute="subnetId" name="subnet-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Subnet ID, should be UUID." />
+                        <xml-property name="description" value="Subnet ID, should be UUID."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="subnetName" name="subnet-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name associated with the subnet." />
+                        <xml-property name="description" value="Name associated with the subnet."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron id of this subnet" />
+                        <xml-property name="description" value="Neutron id of this subnet"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="gatewayAddress" name="gateway-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="gateway ip address" />
+                        <xml-property name="description" value="gateway ip address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="network start address" />
+                        <xml-property name="description" value="network start address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="cidr mask" />
+                        <xml-property name="description" value="cidr mask"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ip version" />
+                        <xml-property name="description" value="ip version"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" required="true" java-attribute="dhcpEnabled" name="dhcp-enabled" type="java.lang.Boolean">
+                <xml-element default-value="false" java-attribute="dhcpEnabled" name="dhcp-enabled" required="true" type="java.lang.Boolean">
                     <xml-properties>
                         <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="dhcp enabled" />
+                        <xml-property name="description" value="dhcp enabled"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dhcpStart" name="dhcp-start" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the start address reserved for use by dhcp" />
+                        <xml-property name="description" value="the start address reserved for use by dhcp"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dhcpEnd" name="dhcp-end" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the last address reserved for use by dhcp" />
+                        <xml-property name="description" value="the last address reserved for use by dhcp"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="subnet-id,subnet-name" />
-                <xml-property name="nameProps" value="subnet-name" />
-                <xml-property name="uniqueProps" value="subnet-id" />
-                <xml-property name="dependentOn" value="l3-network" />
-                <xml-property name="container" value="subnets" />
+                <xml-property name="indexedProps" value="subnet-id,subnet-name"/>
+                <xml-property name="nameProps" value="subnet-name"/>
+                <xml-property name="uniqueProps" value="subnet-id"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="subnets"/>
             </xml-properties>
         </java-type>
 
         <java-type name="GenericVnfs">
             <xml-properties>
-                <xml-property name="description" value="Collection of VNFs" />
+                <xml-property name="description" value="Collection of VNFs"/>
             </xml-properties>
-            <xml-root-element name="generic-vnfs" />
+            <xml-root-element name="generic-vnfs"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v9.GenericVnf" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v9.GenericVnf"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="maximumDepth" value="0" />
+                <xml-property name="maximumDepth" value="0"/>
             </xml-properties>
         </java-type>
 
         <java-type name="GenericVnf">
-            <xml-root-element name="generic-vnf" />
+            <xml-root-element name="generic-vnf"/>
             <java-attributes>
                 <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of VNF." />
+                        <xml-property name="description" value="Name of VNF."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Alternate name of VNF." />
+                        <xml-property name="description" value="Alternate name of VNF."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED" />
+                        <xml-property name="description" value="Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" />
+                        <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path." />
-                        <xml-property name="dbAlias" value="operational-status" />
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path."/>
+                        <xml-property name="dbAlias" value="operational-status"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="OBSOLETE -  do not use" />
+                        <xml-property name="description" value="OBSOLETE -  do not use"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Client should send valid enumerated value" />
+                        <xml-property name="description" value="Client should send valid enumerated value"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this VNF, used by MSO." />
+                        <xml-property name="description" value="Orchestration status of this VNF, used by MSO."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="identifier of managed by company or customer" />
+                        <xml-property name="description" value="identifier of managed by company or customer"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf." />
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="v4 Loopback0 address" />
+                        <xml-property name="description" value="v4 Loopback0 address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="nmLanV6Address" name="nm-lan-v6-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="v6 Loopback address" />
+                        <xml-property name="description" value="v6 Loopback address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="managementV6Address" name="management-v6-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="v6 management address" />
+                        <xml-property name="description" value="v6 management address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vcpu" name="vcpu" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only in some usecases" />
+                        <xml-property name="description" value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only in some usecases"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vcpuUnits" name="vcpu-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only in some usecases" />
+                        <xml-property name="description" value="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only in some usecases"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vmemory" name="vmemory" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only in some usecases" />
+                        <xml-property name="description" value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only in some usecases"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vmemoryUnits" name="vmemory-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only in some usecases" />
+                        <xml-property name="description" value="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only in some usecases"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vdisk" name="vdisk" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only in some usecases" />
+                        <xml-property name="description" value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only in some usecases"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vdiskUnits" name="vdisk-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only in some usecases" />
+                        <xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only in some usecases"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
                     <xml-properties>
                         <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean">
+                <xml-element default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" type="java.lang.Boolean">
                     <xml-properties>
                         <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node" />
+                        <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="summaryStatus" name="summary-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="details regarding the generic-vnf operation, PLEASE DISCONTINUE USE OF THIS FIELD." />
+                        <xml-property name="description" value="details regarding the generic-vnf operation, PLEASE DISCONTINUE USE OF THIS FIELD."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="encryptedAccessFlag" name="encrypted-access-flag" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="indicates whether generic-vnf access uses SSH" />
+                        <xml-property name="description" value="indicates whether generic-vnf access uses SSH"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model id for this resource or service model." />
-                        <xml-property name="dbAlias" value="model-invariant-id-local" />
-                        <xml-property name="requires" value="persona-model-version" />
-                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                        <xml-property name="requires" value="persona-model-version"/>
+                        <xml-property name="visibility" value="deployment"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                        <xml-property name="visibility" value="deployment" />
-                        <xml-property name="requires" value="persona-model-id" />
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="persona-model-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                        <xml-property name="visibility" value="internal" />
-                        <xml-property name="dbAlias" value="model-version-id-local" />
-                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="internal"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="personaModelCustomizationId" name="persona-model-customization-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." />
-                        <xml-property name="dbAlias" value="model-customization-id" />
+                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service."/>
+                        <xml-property name="dbAlias" value="model-customization-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="asNumber" name="as-number" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="as-number of the VNF" />
+                        <xml-property name="description" value="as-number of the VNF"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="regionalResourceSubzone" name="regional-resource-subzone" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="represents sub zone of the rr plane" />
+                        <xml-property name="description" value="represents sub zone of the rr plane"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Path to the controller object." />
+                        <xml-property name="description" value="Path to the controller object."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces" />
-                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v9.LagInterfaces" />
-                <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v9.VfModules" />
-                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v9.Licenses" />
-                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v9.Entitlements" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v9.LagInterfaces"/>
+                <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v9.VfModules"/>
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v9.Licenses"/>
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v9.Entitlements"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="General purpose VNF" />
-                <xml-property name="nameProps" value="vnf-name" />
-                <xml-property name="indexedProps" value="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version" />
-                <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" />
-                <xml-property name="uniqueProps" value="vnf-id" />
-                <xml-property name="container" value="generic-vnfs" />
-                <xml-property name="namespace" value="network" />
-                <xml-property name="extends" value="vnf" />
+                <xml-property name="description" value="General purpose VNF"/>
+                <xml-property name="nameProps" value="vnf-name"/>
+                <xml-property name="indexedProps" value="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version"/>
+                <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
+                <xml-property name="uniqueProps" value="vnf-id"/>
+                <xml-property name="container" value="generic-vnfs"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="extends" value="vnf"/>
+            <xml-property name="requiredProps" value="vnf-id,vnf-name,vnf-type,in-maint,is-closed-loop-disabled"/>
             </xml-properties>
         </java-type>
 
         <java-type name="VfModules">
             <xml-properties>
-                <xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs" />
+                <xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs"/>
             </xml-properties>
-            <xml-root-element name="vf-modules" />
+            <xml-root-element name="vf-modules"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v9.VfModule" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v9.VfModule"/>
             </java-attributes>
         </java-type>
 
         <java-type name="VfModule">
-            <xml-root-element name="vf-module" />
+            <xml-root-element name="vf-module"/>
             <java-attributes>
                 <xml-element java-attribute="vfModuleId" name="vf-module-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of vf-module." />
+                        <xml-property name="description" value="Unique ID of vf-module."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfModuleName" name="vf-module-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of vf-module" />
+                        <xml-property name="description" value="Name of vf-module"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Heat stack id corresponding to this instance." />
+                        <xml-property name="description" value="Heat stack id corresponding to this instance."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="orchestration status of this vf-module, mastered by MSO" />
+                        <xml-property name="description" value="orchestration status of this vf-module, mastered by MSO"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" required="true" java-attribute="isBaseVfModule" name="is-base-vf-module" type="java.lang.Boolean">
+                <xml-element default-value="false" java-attribute="isBaseVfModule" name="is-base-vf-module" required="true" type="java.lang.Boolean">
                     <xml-properties>
                         <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="used to indicate whether or not this object is base vf module" />
+                        <xml-property name="description" value="used to indicate whether or not this object is base vf module"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model id for this resource or service model." />
-                        <xml-property name="dbAlias" value="model-invariant-id-local" />
-                        <xml-property name="requires" value="persona-model-version" />
-                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                        <xml-property name="requires" value="persona-model-version"/>
+                        <xml-property name="visibility" value="deployment"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                        <xml-property name="visibility" value="deployment" />
-                        <xml-property name="requires" value="persona-model-id" />
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="persona-model-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                        <xml-property name="visibility" value="internal" />
-                        <xml-property name="dbAlias" value="model-version-id-local" />
-                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="internal"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="personaModelCustomizationId" name="persona-model-customization-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." />
-                        <xml-property name="dbAlias" value="model-customization-id" />
+                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service."/>
+                        <xml-property name="dbAlias" value="model-customization-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="contrailServiceInstanceFqdn" name="contrail-service-instance-fqdn" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the Contrail unique ID for a service-instance" />
+                        <xml-property name="description" value="the Contrail unique ID for a service-instance"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="moduleIndex" name="module-index" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit" />
+                        <xml-property name="description" value="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Path to the controller object." />
+                        <xml-property name="description" value="Path to the controller object."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="a deployment unit of VNFCs" />
-                <xml-property name="indexedProps" value="vf-module-id,vf-module-name,heat-stack-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-service-instance-fqdn" />
-                <xml-property name="searchable" value="vf-module-id,vf-module-name" />
-                <xml-property name="dependentOn" value="generic-vnf" />
-                <xml-property name="container" value="vf-modules" />
+                <xml-property name="description" value="a deployment unit of VNFCs"/>
+                <xml-property name="indexedProps" value="vf-module-id,vf-module-name,heat-stack-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-service-instance-fqdn"/>
+                <xml-property name="searchable" value="vf-module-id,vf-module-name"/>
+                <xml-property name="dependentOn" value="generic-vnf"/>
+                <xml-property name="container" value="vf-modules"/>
+            <xml-property name="requiredProps" value="vf-module-id,is-base-vf-module"/>
             </xml-properties>
         </java-type>
 
 
         <java-type name="LagLinks">
             <xml-properties>
-                <xml-property name="description" value="Collection of link aggregation connections" />
+                <xml-property name="description" value="Collection of link aggregation connections"/>
             </xml-properties>
-            <xml-root-element name="lag-links" />
+            <xml-root-element name="lag-links"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v9.LagLink" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v9.LagLink"/>
             </java-attributes>
         </java-type>
 
         <java-type name="LagLink">
-            <xml-root-element name="lag-link" />
+            <xml-root-element name="lag-link"/>
             <java-attributes>
                 <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Alphabetical concatenation of lag-interface names" />
+                        <xml-property name="description" value="Alphabetical concatenation of lag-interface names"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="LAG links can connect lag-interfaces" />
-                <xml-property name="indexedProps" value="link-name" />
-                <xml-property name="container" value="lag-links" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="LAG links can connect lag-interfaces"/>
+                <xml-property name="indexedProps" value="link-name"/>
+                <xml-property name="container" value="lag-links"/>
+                <xml-property name="namespace" value="network"/>
+            <xml-property name="requiredProps" value="link-name"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Newvces">
             <xml-properties>
-                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
+                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce."/>
             </xml-properties>
-            <xml-root-element name="newvces" />
+            <xml-root-element name="newvces"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v9.Newvce" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v9.Newvce"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Newvce">
-            <xml-root-element name="newvce" />
+            <xml-root-element name="newvce"/>
             <java-attributes>
                 <xml-element java-attribute="vnfId2" name="vnf-id2" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object" />
+                        <xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of VNF." />
+                        <xml-property name="description" value="Name of VNF."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Alternate name of VNF." />
+                        <xml-property name="description" value="Alternate name of VNF."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator for whether the resource is considered operational" />
-                        <xml-property name="dbAlias" value="operational-status" />
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                        <xml-property name="dbAlias" value="operational-status"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="OBSOLETE -  do not use" />
+                        <xml-property name="description" value="OBSOLETE -  do not use"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address)." />
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address)."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Client should send valid enumerated value." />
+                        <xml-property name="description" value="Client should send valid enumerated value."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="v4 Loopback0 address" />
+                        <xml-property name="description" value="v4 Loopback0 address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO." />
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
-                <xml-property name="nameProps" value="vnf-name" />
-                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2" />
-                <xml-property name="searchable" value="vnf-id2,vnf-name,vnf-name2" />
-                <xml-property name="uniqueProps" value="vnf-id2" />
-                <xml-property name="container" value="newvces" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce."/>
+                <xml-property name="nameProps" value="vnf-name"/>
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2"/>
+                <xml-property name="searchable" value="vnf-id2,vnf-name,vnf-name2"/>
+                <xml-property name="uniqueProps" value="vnf-id2"/>
+                <xml-property name="container" value="newvces"/>
+                <xml-property name="namespace" value="network"/>
+            <xml-property name="requiredProps" value="vnf-id2,vnf-name,vnf-type"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Pnfs">
             <xml-properties>
-                <xml-property name="description" value="Collection of Physical Network Functions." />
+                <xml-property name="description" value="Collection of Physical Network Functions."/>
             </xml-properties>
-            <xml-root-element name="pnfs" />
+            <xml-root-element name="pnfs"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v9.Pnf" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v9.Pnf"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="maximumDepth" value="0" />
+                <xml-property name="maximumDepth" value="0"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Pnf">
-            <xml-root-element name="pnf" />
+            <xml-root-element name="pnf"/>
             <java-attributes>
                 <xml-element java-attribute="pnfName" name="pnf-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="unique name of Physical Network Function." />
+                        <xml-property name="description" value="unique name of Physical Network Function."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="pnfName2" name="pnf-name2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="name of Physical Network Function." />
+                        <xml-property name="description" value="name of Physical Network Function."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="pnfName2Source" name="pnf-name2-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="source of name2" />
+                        <xml-property name="description" value="source of name2"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="pnfId" name="pnf-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="id of pnf" />
+                        <xml-property name="description" value="id of pnf"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values." />
+                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values." />
+                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values." />
+                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="identifier of managed by company or customer" />
+                        <xml-property name="description" value="identifier of managed by company or customer"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV4Oam" name="ipaddress-v4-oam" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses" />
+                        <xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="swVersion" name="sw-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF." />
+                        <xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
                     <xml-properties>
                         <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                        <xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="frameId" name="frame-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed." />
+                        <xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Serial number of the device" />
+                        <xml-property name="description" value="Serial number of the device"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV4 Loopback 0 address" />
+                        <xml-property name="description" value="IPV4 Loopback 0 address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV6 Loopback 0 address" />
+                        <xml-property name="description" value="IPV6 Loopback 0 address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV4 AIM address" />
+                        <xml-property name="description" value="IPV4 AIM address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV6 AIM address" />
+                        <xml-property name="description" value="IPV6 AIM address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV6 OAM address" />
+                        <xml-property name="description" value="IPV6 OAM address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI." />
+                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" />
+                        <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Nf Role is the role performed by this instance in the network." />
+                        <xml-property name="description" value="Nf Role is the role performed by this instance in the network."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
-                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v9.PInterfaces" />
-                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v9.LagInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v9.PInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v9.LagInterfaces"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world." />
-                <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status" />
-                <xml-property name="searchable" value="pnf-name" />
-                <xml-property name="uniqueProps" value="pnf-name" />
-                <xml-property name="container" value="pnfs" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world."/>
+                <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status"/>
+                <xml-property name="searchable" value="pnf-name"/>
+                <xml-property name="uniqueProps" value="pnf-name"/>
+                <xml-property name="container" value="pnfs"/>
+                <xml-property name="namespace" value="network"/>
+            <xml-property name="requiredProps" value="pnf-name,in-maint"/>
             </xml-properties>
         </java-type>
 
         <java-type name="PhysicalLinks">
             <xml-properties>
-                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
+                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/>
             </xml-properties>
-            <xml-root-element name="physical-links" />
+            <xml-root-element name="physical-links"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v9.PhysicalLink" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v9.PhysicalLink"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="maximumDepth" value="0" />
+                <xml-property name="maximumDepth" value="0"/>
             </xml-properties>
         </java-type>
 
         <java-type name="PhysicalLink">
-            <xml-root-element name="physical-link" />
+            <xml-root-element name="physical-link"/>
             <java-attributes>
                 <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ" />
+                        <xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the numeric part of the speed" />
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the units corresponding to the speed" />
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Circuit it" />
+                        <xml-property name="description" value="Circuit it"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dualMode" name="dual-mode" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Dual access mode (e.g., primary, secondary" />
+                        <xml-property name="description" value="Dual access mode (e.g., primary, secondary"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider" />
+                        <xml-property name="description" value="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="serviceProviderName" name="service-provider-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the service Provider on this link." />
+                        <xml-property name="description" value="Name of the service Provider on this link."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
-                <xml-property name="indexedProps" value="circuit-id,link-name" />
-                <xml-property name="alternateKeys1" value="circuit-id" />
-                <xml-property name="container" value="physical-links" />
-                <xml-property name="namespace" value="network" />
-                <xml-property name="searchable" value="link-name,circuit-id" />
+                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/>
+                <xml-property name="indexedProps" value="circuit-id,link-name"/>
+                <xml-property name="alternateKeys1" value="circuit-id"/>
+                <xml-property name="container" value="physical-links"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="searchable" value="link-name,circuit-id"/>
+            <xml-property name="requiredProps" value="link-name"/>
             </xml-properties>
         </java-type>
 
         <java-type name="VigServers">
-            <xml-root-element name="vig-servers" />
+            <xml-root-element name="vig-servers"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v9.VigServer" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v9.VigServer"/>
             </java-attributes>
         </java-type>
 
         <java-type name="VigServer">
-            <xml-root-element name="vig-server" />
+            <xml-root-element name="vig-server"/>
             <java-attributes>
                 <xml-element java-attribute="vigAddressType" name="vig-address-type" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET" />
+                        <xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String" >
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="v4 IP of the vig server" />
+                        <xml-property name="description" value="v4 IP of the vig server"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String" >
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="v6 IP of the vig server" />
+                        <xml-property name="description" value="v6 IP of the vig server"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607" />
-                <xml-property name="indexedProps" value="vig-address-type" />
-                <xml-property name="dependentOn" value="ipsec-configuration" />
-                <xml-property name="container" value="vig-servers" />
+                <xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607"/>
+                <xml-property name="indexedProps" value="vig-address-type"/>
+                <xml-property name="dependentOn" value="ipsec-configuration"/>
+                <xml-property name="container" value="vig-servers"/>
+            <xml-property name="requiredProps" value="vig-address-type"/>
             </xml-properties>
         </java-type>
 
         <java-type name="IpsecConfigurations">
-            <xml-root-element name="ipsec-configurations" />
+            <xml-root-element name="ipsec-configurations"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v9.IpsecConfiguration" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v9.IpsecConfiguration"/>
             </java-attributes>
         </java-type>
 
         <java-type name="IpsecConfiguration">
-            <xml-root-element name="ipsec-configuration" />
+            <xml-root-element name="ipsec-configuration"/>
             <java-attributes>
                 <xml-element java-attribute="ipsecConfigurationId" name="ipsec-configuration-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="UUID of this configuration" />
+                        <xml-property name="description" value="UUID of this configuration"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="requestedVigAddressType" name="requested-vig-address-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH" />
+                        <xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="requestedEncryptionStrength" name="requested-encryption-strength" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
+                        <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="can offer a shared DMZ or a DMZ specific to a customer" />
+                        <xml-property name="description" value="can offer a shared DMZ or a DMZ specific to a customer"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Network address of shared DMZ" />
+                        <xml-property name="description" value="Network address of shared DMZ"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="requestedCustomerName" name="requested-customer-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information" />
+                        <xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ikeVersion" name="ike-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="can be 1 or 2" />
+                        <xml-property name="description" value="can be 1 or 2"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ikev1Authentication" name="ikev1-authentication" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Contains values like md5, sha1, sha256, sha384" />
+                        <xml-property name="description" value="Contains values like md5, sha1, sha256, sha384"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
+                        <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14" />
+                        <xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ikev1AmGroupId" name="ikev1-am-group-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Group name defined in VIG for clients using aggressive mode" />
+                        <xml-property name="description" value="Group name defined in VIG for clients using aggressive mode"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ikev1AmPassword" name="ikev1-am-password" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="pre-shared key for the above group name " />
+                        <xml-property name="description" value="pre-shared key for the above group name "/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ikev1SaLifetime" name="ikev1-sa-lifetime" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Lifetime for IKEv1 SA" />
+                        <xml-property name="description" value="Lifetime for IKEv1 SA"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipsecAuthentication" name="ipsec-authentication" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="md5, sha1, sha256, sha384" />
+                        <xml-property name="description" value="md5, sha1, sha256, sha384"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
+                        <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Life time for IPSec SA" />
+                        <xml-property name="description" value="Life time for IPSec SA"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipsecPfs" name="ipsec-pfs" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="enable PFS or not" />
+                        <xml-property name="description" value="enable PFS or not"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="xauthUserId" name="xauth-userid" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="user ID for xAuth, sm-user, ,nmteHostName" />
+                        <xml-property name="description" value="user ID for xAuth, sm-user, ,nmteHostName"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="xauthUserPassword" name="xauth-user-password" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Encrypted using the Juniper $9$ algorithm" />
+                        <xml-property name="description" value="Encrypted using the Juniper $9$ algorithm"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dpdInterval" name="dpd-interval" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The time between DPD probe" />
+                        <xml-property name="description" value="The time between DPD probe"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dpdFrequency" name="dpd-frequency" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down" />
+                        <xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
-                <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v9.VigServers" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
+                <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v9.VigServers"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C" />
-                <xml-property name="indexedProps" value="ipsec-configuration-id" />
-                <xml-property name="uniqueProps" value="ipsec-configuration-id" />
-                <xml-property name="container" value="ipsec-configurations" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C"/>
+                <xml-property name="indexedProps" value="ipsec-configuration-id"/>
+                <xml-property name="uniqueProps" value="ipsec-configuration-id"/>
+                <xml-property name="container" value="ipsec-configurations"/>
+                <xml-property name="namespace" value="network"/>
+            <xml-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.v9.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.v9.NotificationEventHeader"/>
+                <xml-any-element java-attribute="entity"/>
             </java-attributes>
         </java-type>
         <java-type name="NotificationEventHeader">
-            <xml-root-element name="notification-event-header" />
-            <java-attributes>
-                <xml-element java-attribute="id" name="id" type="java.lang.String" />
-                <xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String" />
-                <xml-element java-attribute="sourceName" name="source-name" type="java.lang.String" />
-                <xml-element java-attribute="domain" name="domain" type="java.lang.String" />
-                <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String" />
-                <xml-element java-attribute="severity" name="severity" type="java.lang.String" />
-                <xml-element java-attribute="eventType" name="event-type" type="java.lang.String" />
-                <xml-element java-attribute="version" name="version" type="java.lang.String" />
-                <xml-element java-attribute="action" name="action" type="java.lang.String" />
-                <xml-element java-attribute="entityType" name="entity-type" type="java.lang.String" />
-                <xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String" />
-                <xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String" />
-                <xml-element java-attribute="status" name="status" type="java.lang.String" />
+            <xml-root-element name="notification-event-header"/>
+            <java-attributes>
+                <xml-element java-attribute="id" name="id" type="java.lang.String"/>
+                <xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String"/>
+                <xml-element java-attribute="sourceName" name="source-name" type="java.lang.String"/>
+                <xml-element java-attribute="domain" name="domain" type="java.lang.String"/>
+                <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String"/>
+                <xml-element java-attribute="severity" name="severity" type="java.lang.String"/>
+                <xml-element java-attribute="eventType" name="event-type" type="java.lang.String"/>
+                <xml-element java-attribute="version" name="version" type="java.lang.String"/>
+                <xml-element java-attribute="action" name="action" type="java.lang.String"/>
+                <xml-element java-attribute="entityType" name="entity-type" type="java.lang.String"/>
+                <xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String"/>
+                <xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String"/>
+                <xml-element java-attribute="status" name="status" type="java.lang.String"/>
             </java-attributes>
         </java-type>
         <java-type name="AaiInternal">
-            <xml-root-element name="aai-internal" />
+            <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.v9.ReservedPropNames" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v9.EdgePropNames" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v9.ReservedPropNames"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v9.EdgePropNames"/>
             </java-attributes>
         </java-type>
         <java-type name="ReservedPropNames">
             <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="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV" />
+                <xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules"/>
+                <xml-property name="edgeInfo" value="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV"/>
             </xml-properties>
-            <xml-root-element name="edge-prop-names" />
+            <xml-root-element name="edge-prop-names"/>
             <java-attributes>
-                <xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String" />
-                <xml-element java-attribute="direction" name="direction" type="java.lang.String" />
-                <xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String" />
-                <xml-element java-attribute="isParent" name="isParent" type="java.lang.Boolean" />
-                <xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean" />
-                <xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean" />
-                <xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.Boolean" />
-                <xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" type="java.lang.Boolean" />
+                <xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String"/>
+                <xml-element java-attribute="direction" name="direction" type="java.lang.String"/>
+                <xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String"/>
+                <xml-element java-attribute="isParent" name="isParent" type="java.lang.Boolean"/>
+                <xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean"/>
+                <xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean"/>
+                <xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.Boolean"/>
+                <xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" type="java.lang.Boolean"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Models">
             <xml-properties>
-                <xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models" />
+                <xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models"/>
             </xml-properties>
-            <xml-root-element name="models" />
+            <xml-root-element name="models"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v9.Model" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v9.Model"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Model">
-            <xml-root-element name="model" />
+            <xml-root-element name="model"/>
             <xml-properties>
-                <xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version" />
-                <xml-property name="nameProps" value="model-type" />
-                <xml-property name="indexedProps" value="model-invariant-id,model-type" />
-                <xml-property name="uniqueProps" value="model-invariant-id" />
-                <xml-property name="container" value="models" />
-                <xml-property name="namespace" value="service-design-and-creation" />
+                <xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version"/>
+                <xml-property name="nameProps" value="model-type"/>
+                <xml-property name="indexedProps" value="model-invariant-id,model-type"/>
+                <xml-property name="uniqueProps" value="model-invariant-id"/>
+                <xml-property name="container" value="models"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+            <xml-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">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC" />
+                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." />
+                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v9.ModelVers" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v9.ModelVers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
         </java-type>
 
 
         <java-type name="ModelVers">
-            <xml-root-element name="model-vers" />
+            <xml-root-element name="model-vers"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v9.ModelVer" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v9.ModelVer"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ModelVer">
-            <xml-root-element name="model-ver" />
+            <xml-root-element name="model-ver"/>
             <xml-properties>
-                <xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models" />
-                <xml-property name="nameProps" value="model-name" />
-                <xml-property name="indexedProps" value="model-version-id,model-name,model-version" />
-                <xml-property name="uniqueProps" value="model-version-id" />
-                <xml-property name="container" value="model-vers" />
+                <xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models"/>
+                <xml-property name="nameProps" value="model-name"/>
+                <xml-property name="indexedProps" value="model-version-id,model-name,model-version"/>
+                <xml-property name="uniqueProps" value="model-version-id"/>
+                <xml-property name="container" value="model-vers"/>
+            <xml-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">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" />
+                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the model, which can change from version to version." />
+                        <xml-property name="description" value="Name of the model, which can change from version to version."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Version" />
+                        <xml-property name="description" value="Version"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Description" />
+                        <xml-property name="description" value="Description"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v9.ModelElements" />
-                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v9.Metadata" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v9.ModelElements"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v9.Metadata"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ModelElements">
-            <xml-root-element name="model-elements" />
+            <xml-root-element name="model-elements"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v9.ModelElement" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v9.ModelElement"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ModelElement">
             <xml-properties>
-                <xml-property name="description" value="Defines how other models combine to make up a higher-level model." />
-                <xml-property name="uniqueProps" value="model-element-uuid" />
-                <xml-property name="indexedProps" value="model-element-uuid" />
-                <xml-property name="allowDirectRead" value="true" />
-                <xml-property name="allowDirectWrite" value="false" />
-                <xml-property name="container" value="model-elements" />
+                <xml-property name="description" value="Defines how other models combine to make up a higher-level model."/>
+                <xml-property name="uniqueProps" value="model-element-uuid"/>
+                <xml-property name="indexedProps" value="model-element-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="model-elements"/>
+            <xml-property name="requiredProps" value="model-element-uuid,new-data-del-flag,cardinality"/>
             </xml-properties>
-            <xml-root-element name="model-element" />
+            <xml-root-element name="model-element"/>
             <java-attributes>
                 <xml-element java-attribute="modelElementUuid" name="model-element-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="autoGenerateUuid" value="true" />
+                        <xml-property name="autoGenerateUuid" value="true"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="newDataDelFlag" name="new-data-del-flag" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model" />
+                        <xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="cardinality" name="cardinality" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="How many of this type of element are required/allowed" />
+                        <xml-property name="description" value="How many of this type of element are required/allowed"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String" >
+                <xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String">
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v9.ModelElements">
                     <xml-properties>
-                        <xml-property name="description" value="Defines how other models combine to make up a higher-level model" />
+                        <xml-property name="description" value="Defines how other models combine to make up a higher-level model"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v9.ModelConstraints">
                     <xml-properties>
-                        <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition" />
+                        <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ModelConstraints">
-            <xml-root-element name="model-constraints" />
+            <xml-root-element name="model-constraints"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v9.ModelConstraint" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v9.ModelConstraint"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ModelConstraint">
             <xml-properties>
-                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
-                <xml-property name="uniqueProps" value="model-constraint-uuid" />
-                <xml-property name="indexedProps" value="model-constraint-uuid" />
-                <xml-property name="allowDirectRead" value="true" />
-                <xml-property name="allowDirectWrite" value="false" />
-                <xml-property name="container" value="model-constraints" />
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="model-constraint-uuid"/>
+                <xml-property name="indexedProps" value="model-constraint-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="model-constraints"/>
+            <xml-property name="requiredProps" value="model-constraint-uuid,constrained-element-set-uuid-to-replace"/>
             </xml-properties>
-            <xml-root-element name="model-constraint" />
+            <xml-root-element name="model-constraint"/>
             <java-attributes>
                 <xml-element java-attribute="modelConstraintUuid" name="model-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="autoGenerateUuid" value="true" />
+                        <xml-property name="autoGenerateUuid" value="true"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String" />
-                <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v9.ConstrainedElementSets" />
+                <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v9.ConstrainedElementSets"/>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
             </java-attributes>
         </java-type>
 
         <java-type name="ConstrainedElementSets">
-            <xml-root-element name="constrained-element-sets" />
+            <xml-root-element name="constrained-element-sets"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v9.ConstrainedElementSet" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v9.ConstrainedElementSet"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ConstrainedElementSet">
             <xml-properties>
-                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
-                <xml-property name="uniqueProps" value="constrained-element-set-uuid" />
-                <xml-property name="indexedProps" value="constrained-element-set-uuid" />
-                <xml-property name="allowDirectRead" value="true" />
-                <xml-property name="allowDirectWrite" value="false" />
-                <xml-property name="container" value="constrained-element-sets" />
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="constrained-element-set-uuid"/>
+                <xml-property name="indexedProps" value="constrained-element-set-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="constrained-element-sets"/>
+            <xml-property name="requiredProps" value="constrained-element-set-uuid,constraint-type,check-type"/>
             </xml-properties>
-            <xml-root-element name="constrained-element-set" />
+            <xml-root-element name="constrained-element-set"/>
             <java-attributes>
                 <xml-element java-attribute="constrainedElementSetUuid" name="constrained-element-set-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="autoGenerateUuid" value="true" />
+                        <xml-property name="autoGenerateUuid" value="true"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" />
-                <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String" />
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-                <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v9.ElementChoiceSets" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v9.ElementChoiceSets"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ElementChoiceSets">
-            <xml-root-element name="element-choice-sets" />
+            <xml-root-element name="element-choice-sets"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v9.ElementChoiceSet" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v9.ElementChoiceSet"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ElementChoiceSet">
             <xml-properties>
-                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
-                <xml-property name="uniqueProps" value="element-choice-set-uuid" />
-                <xml-property name="indexedProps" value="element-choice-set-uuid" />
-                <xml-property name="allowDirectRead" value="true" />
-                <xml-property name="allowDirectWrite" value="false" />
-                <xml-property name="container" value="element-choice-sets" />
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="element-choice-set-uuid"/>
+                <xml-property name="indexedProps" value="element-choice-set-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="element-choice-sets"/>
+            <xml-property name="requiredProps" value="element-choice-set-uuid,element-choice-set-name"/>
             </xml-properties>
-            <xml-root-element name="element-choice-set" />
+            <xml-root-element name="element-choice-set"/>
             <java-attributes>
                 <xml-element java-attribute="elementChoiceSetUuid" name="element-choice-set-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="autoGenerateUuid" value="true" />
+                        <xml-property name="autoGenerateUuid" value="true"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String" />
-                <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String" />
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v9.ModelElements" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v9.ModelElements"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
         </java-type>
 
         <java-type name="NamedQueries">
-            <xml-root-element name="named-queries" />
+            <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.v9.NamedQuery" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v9.NamedQuery"/>
             </java-attributes>
         </java-type>
 
         <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-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" />
+            <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 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.v9.NamedQueryElements" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <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.v9.NamedQueryElements"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
         </java-type>
 
         <java-type name="NamedQueryElements">
-            <xml-root-element name="named-query-elements" />
+            <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.v9.NamedQueryElement" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v9.NamedQueryElement"/>
             </java-attributes>
         </java-type>
 
         <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-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" />
+            <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.v9.NamedQueryElements" />
-                <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v9.RelatedLookups" />
-                <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v9.PropertyConstraints" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <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.v9.NamedQueryElements"/>
+                <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v9.RelatedLookups"/>
+                <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v9.PropertyConstraints"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
         </java-type>
 
         <java-type name="RelatedLookups">
-            <xml-root-element name="related-lookups" />
+            <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.v9.RelatedLookup" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v9.RelatedLookup"/>
             </java-attributes>
         </java-type>
 
         <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-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" />
+            <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.v9.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.v9.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.v9.PropertyConstraint" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v9.PropertyConstraint"/>
             </java-attributes>
         </java-type>
 
         <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-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" />
+            <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.v9.QueryParameters" />
-                <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v9.InstanceFilters" />
-                <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v9.SecondaryFilts" />
-                <xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String" />
-                <xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String" />
+                <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v9.QueryParameters"/>
+                <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v9.InstanceFilters"/>
+                <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v9.SecondaryFilts"/>
+                <xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String"/>
+                <xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String"/>
             </java-attributes>
         </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.v9.NamedQuery" />
-                <xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v9.OverloadedModel" />
+                <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v9.NamedQuery"/>
+                <xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v9.OverloadedModel"/>
             </java-attributes>
         </java-type>
 
         <java-type name="OverloadedModel">
-            <xml-root-element name="overloaded-model" />
+            <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="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">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC" />
+                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelNameVersionId" name="model-name-version-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" />
+                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." />
+                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the model, which can change from version to version." />
+                        <xml-property name="description" value="Name of the model, which can change from version to version."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelId" name="model-id" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Invariant unique ID which does not change from version to version" />
+                        <xml-property name="description" value="Invariant unique ID which does not change from version to version"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Version" />
+                        <xml-property name="description" value="Version"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Description" />
+                        <xml-property name="description" value="Description"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v9.ModelVers" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v9.ModelVers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
         </java-type>
 
         <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.v9.InstanceFilter" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v9.InstanceFilter"/>
             </java-attributes>
         </java-type>
 
         <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.v9.SecondaryFilt" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v9.SecondaryFilt"/>
             </java-attributes>
         </java-type>
 
         <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.v9.InventoryResponseItems" />
+                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v9.InventoryResponseItems"/>
             </java-attributes>
         </java-type>
 
         <java-type name="InventoryResponseItems">
             <xml-properties>
-                <xml-property name="description" value="Container for inventory items in response list" />
-                <xml-property name="container" value="response-list" />
+                <xml-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.v9.InventoryResponseItem" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v9.InventoryResponseItem"/>
             </java-attributes>
         </java-type>
 
         <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.v9.ExtraProperties" />
-                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v9.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.v9.ExtraProperties"/>
+                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v9.InventoryResponseItems"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ExtraProperties">
             <xml-properties>
-                <xml-property name="description" value="Extra properties for inventory item for response list" />
+                <xml-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-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v9.ExtraProperty" />
+                <xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v9.ExtraProperty"/>
             </java-attributes>
         </java-type>
 
         <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-any-element java-attribute="propertyValue" lax="true" name="property-value" />
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-any-element java-attribute="propertyValue" lax="true" name="property-value"/>
             </java-attributes>
         </java-type>
 
         <java-type name="RouteTableReferences">
             <xml-properties>
-                <xml-property name="description" value="Collection of openstack route table references" />
+                <xml-property name="description" value="Collection of openstack route table references"/>
             </xml-properties>
-            <xml-root-element name="route-table-references" />
+            <xml-root-element name="route-table-references"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v9.RouteTableReference" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v9.RouteTableReference"/>
             </java-attributes>
         </java-type>
 
         <java-type name="RouteTableReference">
-            <xml-root-element name="route-table-reference" />
+            <xml-root-element name="route-table-reference"/>
             <java-attributes>
                 <xml-element java-attribute="routeTableReferenceId" name="route-table-reference-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." />
+                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="routeTableReferenceFqdn" name="route-table-reference-fqdn" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="FQDN entry in the route table." />
+                        <xml-property name="description" value="FQDN entry in the route table."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value" />
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
 
             <xml-properties>
-                <xml-property name="description" value="Openstack route table reference." />
-                <xml-property name="nameProps" value="route-table-reference-fqdn" />
-                <xml-property name="uniqueProps" value="route-table-reference-id" />
-                <xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn" />
-                <xml-property name="container" value="route-table-references" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="Openstack route table reference."/>
+                <xml-property name="nameProps" value="route-table-reference-fqdn"/>
+                <xml-property name="uniqueProps" value="route-table-reference-id"/>
+                <xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn"/>
+                <xml-property name="container" value="route-table-references"/>
+                <xml-property name="namespace" value="network"/>
+            <xml-property name="requiredProps" value="route-table-reference-id,route-table-reference-fqdn"/>
             </xml-properties>
         </java-type>
 
         <java-type name="InstanceGroups">
             <xml-properties>
-                <xml-property name="description" value="Collection of openstack route table references" />
+                <xml-property name="description" value="Collection of openstack route table references"/>
             </xml-properties>
-            <xml-root-element name="instance-groups" />
+            <xml-root-element name="instance-groups"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v9.InstanceGroup" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v9.InstanceGroup"/>
             </java-attributes>
         </java-type>
 
         <java-type name="InstanceGroup">
-            <xml-root-element name="instance-group" />
+            <xml-root-element name="instance-group"/>
             <java-attributes>
                 <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Instance Group ID, UUID assigned to this instance." />
+                        <xml-property name="description" value="Instance Group ID, UUID assigned to this instance."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="description" name="description" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Descriptive text to help identify the usage of this instance-group" />
+                        <xml-property name="description" value="Descriptive text to help identify the usage of this instance-group"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="type" name="type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Only valid value today is lower case ha for high availability" />
+                        <xml-property name="description" value="Only valid value today is lower case ha for high availability"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="subType" name="sub-type"  type="java.lang.String">
+                <xml-element java-attribute="subType" name="sub-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]" />
+                        <xml-property name="description" value="Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value" />
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
 
             <xml-properties>
-                <xml-property name="description" value="General mechanism for grouping instances" />
-                <xml-property name="nameProps" value="description" />
-                <xml-property name="uniqueProps" value="id" />
-                <xml-property name="indexedProps" value="id,description,type,sub-type" />
-                <xml-property name="container" value="instance-groups" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="General mechanism for grouping instances"/>
+                <xml-property name="nameProps" value="description"/>
+                <xml-property name="uniqueProps" value="id"/>
+                <xml-property name="indexedProps" value="id,description,type,sub-type"/>
+                <xml-property name="container" value="instance-groups"/>
+                <xml-property name="namespace" value="network"/>
+            <xml-property name="requiredProps" value="id,description,type"/>
             </xml-properties>
         </java-type>
 
 
         <java-type name="SegmentationAssignments">
             <xml-properties>
-                <xml-property name="description" value="Collection of openstack segmentation assignments" />
+                <xml-property name="description" value="Collection of openstack segmentation assignments"/>
             </xml-properties>
-            <xml-root-element name="segmentation-assignments" />
+            <xml-root-element name="segmentation-assignments"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v9.SegmentationAssignment" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v9.SegmentationAssignment"/>
             </java-attributes>
         </java-type>
 
         <java-type name="SegmentationAssignment">
-            <xml-root-element name="segmentation-assignment" />
+            <xml-root-element name="segmentation-assignment"/>
             <java-attributes>
                 <xml-element java-attribute="segmentationId" name="segmentation-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." />
+                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value" />
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Openstack segmentation assignment." />
-                <xml-property name="indexedProps" value="segmentation-id" />
-                <xml-property name="dependentOn" value="l3-network" />
-                <xml-property name="container" value="segmentation-assignments" />
+                <xml-property name="description" value="Openstack segmentation assignment."/>
+                <xml-property name="indexedProps" value="segmentation-id"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="segmentation-assignments"/>
+            <xml-property name="requiredProps" value="segmentation-id"/>
             </xml-properties>
         </java-type>
 
         <java-type name="AllottedResources">
             <xml-properties>
-                <xml-property name="description" value="This object is used to store slices of services being offered" />
+                <xml-property name="description" value="This object is used to store slices of services being offered"/>
             </xml-properties>
-            <xml-root-element name="allotted-resources" />
+            <xml-root-element name="allotted-resources"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v9.AllottedResource" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v9.AllottedResource"/>
             </java-attributes>
         </java-type>
 
         <java-type name="AllottedResource">
-            <xml-root-element name="allotted-resource" />
+            <xml-root-element name="allotted-resource"/>
             <java-attributes>
                 <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance." />
+                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="description" name="description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The descriptive information assigned to this allotted resource instance" />
+                        <xml-property name="description" value="The descriptive information assigned to this allotted resource instance"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Link back to more information in the controller" />
+                        <xml-property name="description" value="Link back to more information in the controller"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model id for this resource or service model." />
-                        <xml-property name="dbAlias" value="model-invariant-id-local" />
-                        <xml-property name="requires" value="persona-model-version" />
-                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                        <xml-property name="requires" value="persona-model-version"/>
+                        <xml-property name="visibility" value="deployment"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                        <xml-property name="visibility" value="deployment" />
-                        <xml-property name="requires" value="persona-model-id" />
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="persona-model-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
-                        <xml-property name="visibility" value="internal" />
-                        <xml-property name="dbAlias" value="model-version-id-local" />
-                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="internal"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="personaModelCustomizationId" name="persona-model-customization-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." />
-                        <xml-property name="dbAlias" value="model-customization-id" />
+                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service."/>
+                        <xml-property name="dbAlias" value="model-customization-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value" />
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v9.TunnelXconnects" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v9.TunnelXconnects"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
 
             <xml-properties>
-                <xml-property name="description" value="Represents a slice or partial piece of a resource that gets separately allotted" />
-                <xml-property name="nameProps" value="description" />
-                <xml-property name="uniqueProps" value="id" />
-                <xml-property name="indexedProps" value="id,persona-model-id,persona-model-version" />
-                <xml-property name="dependentOn" value="service-instance" />
-                <xml-property name="container" value="allotted-resources" />
+                <xml-property name="description" value="Represents a slice or partial piece of a resource that gets separately allotted"/>
+                <xml-property name="nameProps" value="description"/>
+                <xml-property name="uniqueProps" value="id"/>
+                <xml-property name="indexedProps" value="id,persona-model-id,persona-model-version"/>
+                <xml-property name="dependentOn" value="service-instance"/>
+                <xml-property name="container" value="allotted-resources"/>
                 <!--  <xml-property name="namespace" value="network" /> -->
+            <xml-property name="requiredProps" value="id"/>
             </xml-properties>
         </java-type>
 
         <java-type name="TunnelXconnects">
             <xml-properties>
-                <xml-property name="description" value="This object is used to store the specific tunnel cross connect aspects of an allotted resource" />
+                <xml-property name="description" value="This object is used to store the specific tunnel cross connect aspects of an allotted resource"/>
             </xml-properties>
-            <xml-root-element name="tunnel-xconnects" />
+            <xml-root-element name="tunnel-xconnects"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v9.TunnelXconnect" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v9.TunnelXconnect"/>
             </java-attributes>
         </java-type>
 
         <java-type name="TunnelXconnect">
-            <xml-root-element name="tunnel-xconnect" />
+            <xml-root-element name="tunnel-xconnect"/>
             <java-attributes>
                 <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance." />
+                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The WAN uplink bandwidth for WAN1" />
+                        <xml-property name="description" value="The WAN uplink bandwidth for WAN1"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The WAN downlink bandwidth for WAN1" />
+                        <xml-property name="description" value="The WAN downlink bandwidth for WAN1"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The WAN uplink bandwidth for WAN2" />
+                        <xml-property name="description" value="The WAN uplink bandwidth for WAN2"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The WAN downlink bandwidth for WAN2" />
+                        <xml-property name="description" value="The WAN downlink bandwidth for WAN2"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value" />
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
 
             <xml-properties>
-                <xml-property name="description" value="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted" />
-                <xml-property name="uniqueProps" value="id" />
-                <xml-property name="indexedProps" value="id" />
-                <xml-property name="dependentOn" value="allotted-resource" />
-                <xml-property name="container" value="tunnel-xconnects" />
+                <xml-property name="description" value="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted"/>
+                <xml-property name="uniqueProps" value="id"/>
+                <xml-property name="indexedProps" value="id"/>
+                <xml-property name="dependentOn" value="allotted-resource"/>
+                <xml-property name="container" value="tunnel-xconnects"/>
                 <!--  <xml-property name="namespace" value="network" /> -->
+            <xml-property name="requiredProps" value="id,bandwidth-up-wan1,bandwidth-down-wan1,bandwidth-up-wan2,bandwidth-down-wan2"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Entitlements">
             <xml-properties>
-                <xml-property name="description" value="Entitlements, keyed by group-uuid and resource-uuid, related to license management" />
+                <xml-property name="description" value="Entitlements, keyed by group-uuid and resource-uuid, related to license management"/>
             </xml-properties>
-            <xml-root-element name="entitlements" />
+            <xml-root-element name="entitlements"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v9.Entitlement" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v9.Entitlement"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Entitlement">
-            <xml-root-element name="entitlement" />
+            <xml-root-element name="entitlement"/>
             <java-attributes>
                 <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID for the entitlement group the resource comes from, should be uuid." />
+                        <xml-property name="description" value="Unique ID for the entitlement group the resource comes from, should be uuid."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of an entitlement resource. " />
+                        <xml-property name="description" value="Unique ID of an entitlement resource. "/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value" />
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Metadata for entitlement group." />
-                <xml-property name="indexedProps" value="group-uuid,resource-uuid" />
-                <xml-property name="dependentOn" value="generic-vnf,vce" />
-                <xml-property name="container" value="entitlements" />
+                <xml-property name="description" value="Metadata for entitlement group."/>
+                <xml-property name="indexedProps" value="group-uuid,resource-uuid"/>
+                <xml-property name="dependentOn" value="generic-vnf,vce"/>
+                <xml-property name="container" value="entitlements"/>
+            <xml-property name="requiredProps" value="group-uuid,resource-uuid"/>
             </xml-properties>
         </java-type>
 
 
         <java-type name="Licenses">
             <xml-properties>
-                <xml-property name="description" value="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management" />
+                <xml-property name="description" value="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management"/>
             </xml-properties>
-            <xml-root-element name="licenses" />
+            <xml-root-element name="licenses"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v9.License" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v9.License"/>
             </java-attributes>
         </java-type>
 
         <java-type name="License">
-            <xml-root-element name="license" />
+            <xml-root-element name="license"/>
             <java-attributes>
                 <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID for the license group the resource belongs to, should be uuid." />
+                        <xml-property name="description" value="Unique ID for the license group the resource belongs to, should be uuid."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of a license resource. " />
+                        <xml-property name="description" value="Unique ID of a license resource. "/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value" />
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Metadata for license group." />
-                <xml-property name="indexedProps" value="group-uuid,resource-uuid" />
-                <xml-property name="dependentOn" value="generic-vnf,vce" />
-                <xml-property name="container" value="licenses" />
+                <xml-property name="description" value="Metadata for license group."/>
+                <xml-property name="indexedProps" value="group-uuid,resource-uuid"/>
+                <xml-property name="dependentOn" value="generic-vnf,vce"/>
+                <xml-property name="container" value="licenses"/>
+            <xml-property name="requiredProps" value="group-uuid,resource-uuid"/>
             </xml-properties>
         </java-type>
 
@@ -5258,71 +5323,73 @@
             <java-attributes>
                 <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
                     </xml-properties>
                 </xml-element>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Abstract vnf class" />
-                <xml-property name="indexedProps" value="vnf-id" />
-                <xml-property name="uniqueProps" value="vnf-id" />
-                <xml-property name="inheritors" value="vce,generic-vnf" />
-                <xml-property name="abstract" value="true" />
+                <xml-property name="description" value="Abstract vnf class"/>
+                <xml-property name="indexedProps" value="vnf-id"/>
+                <xml-property name="uniqueProps" value="vnf-id"/>
+                <xml-property name="inheritors" value="vce,generic-vnf"/>
+                <xml-property name="abstract" value="true"/>
+            <xml-property name="requiredProps" value="vnf-id"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Zones">
             <xml-properties>
-                <xml-property name="description" value="Collection of zones" />
+                <xml-property name="description" value="Collection of zones"/>
             </xml-properties>
-            <xml-root-element name="zones" />
+            <xml-root-element name="zones"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v9.Zone" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v9.Zone"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Zone">
-            <xml-root-element name="zone" />
+            <xml-root-element name="zone"/>
             <java-attributes>
                 <xml-element java-attribute="zoneId" name="zone-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Code assigned by AIC to the zone" />
+                        <xml-property name="description" value="Code assigned by AIC to the zone"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="zoneName" name="zone-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="English name associated with the zone" />
+                        <xml-property name="description" value="English name associated with the zone"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Design of zone [Medium/Large?]" />
+                        <xml-property name="description" value="Design of zone [Medium/Large?]"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Context of zone [production/test]" />
+                        <xml-property name="description" value="Context of zone [production/test]"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="status" name="status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Status of a zone." />
+                        <xml-property name="description" value="Status of a zone."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value" />
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB" />
-                <xml-property name="nameProps" value="zone-name" />
-                <xml-property name="indexedProps" value="zone-id,design-type,zone-context" />
-                <xml-property name="uniqueProps" value="zone-id" />
-                <xml-property name="container" value="zones" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB"/>
+                <xml-property name="nameProps" value="zone-name"/>
+                <xml-property name="indexedProps" value="zone-id,design-type,zone-context"/>
+                <xml-property name="uniqueProps" value="zone-id"/>
+                <xml-property name="container" value="zones"/>
+                <xml-property name="namespace" value="network"/>
+            <xml-property name="requiredProps" value="zone-id,zone-name,design-type,zone-context"/>
             </xml-properties>
         </java-type>