Add required properties to schema

[aai/aai-common.git] / aai-schema / src / main / resources / onap / aai_schema / aai_schema_v9.xsd
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>