[AAI] Release docker artifact 1.12.4

[aai/schema-service.git] / aai-schema / src / main / resources / onap / aai_schema / aai_schema_v20.xsd
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd

index 23430d2..7dd1d8f 100644 (file)
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd
@@ -2657,65 +2657,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="otn-label-restriction">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a otn-label-restriction attribute",indexedProps="lr-id",searchable="lr-id",uniqueProps="lr-id",container="otn-label-restrictions",dependentOn="bandwidth-attribute",requiredProps="lr-id")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="lr-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the label restriction")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="range-bitmap" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Bitmap of available labels starting from label-start to label-end.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="label-step" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Step of labels in label range.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="otn-label-restrictions">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Label Restriction. Added for ENNI in MDONS use case.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:otn-label-restriction" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
    <xs:element name="bandwidth-attribute">
      <xs:complexType>
        <xs:annotation>
@@ -2747,7 +2688,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
          </xs:element>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
          <xs:element ref="tns:available-bandwidth-map" minOccurs="0"/>
-        <xs:element ref="tns:otn-label-restrictions" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
@@ -3824,252 +3764,225 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="logical-link">
+  <xs:element name="allotted-resource">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,link-type,purpose,operational-status",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",uriTemplate="/network/logical-links/logical-link/{link-name}",requiredProps="link-name,in-maint,link-type")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description,allotted-resource-name",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role,allotted-resource-name,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,vpn-name,orchestration-status",dependentOn="service-instance",container="allotted-resources",uriTemplate="/allotted-resources/allotted-resource/{id}",requiredProps="id")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="link-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="link-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of logical link, e.g., evc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
+        <xs:element name="id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
+              <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="speed-units" type="xs:string" minOccurs="0">
+        <xs:element name="description" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The descriptive information assigned to this allotted resource instance")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="available-capacity" type="xs:string" minOccurs="0">
+        <xs:element name="selflink" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Link back to more information in the controller")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="admin-state" type="xs:string" minOccurs="0">
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the administrative state of the link")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="v4, v6, or ds for dual stack")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="routing-protocol" type="xs:string" minOccurs="0">
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="For example, static or BGP")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
+        <xs:element name="type" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Generic description of the type of allotted resource.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
+        <xs:element name="role" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="role in the network that this resource will be providing.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
+        <xs:element name="allotted-resource-name" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the name of this allotted-resource.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
+        <xs:element name="access-provider-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indication of operational status of the logical link.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access provider of this allotted-resource.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
+        <xs:element name="access-client-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access client of this allotted-resource.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="link-role" type="xs:string" minOccurs="0">
+        <xs:element name="access-topology-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indication of the network use of the logical link.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access topology of this allotted-resource.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="link-name2" type="xs:string" minOccurs="0">
+        <xs:element name="access-node-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Alias or alternate name (CLCI or D1 name).")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access node of this allotted-resource.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="link-id" type="xs:string" minOccurs="0">
+        <xs:element name="access-ltp-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="UUID of the logical-link, SDNC generates this.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access ltp of this allotted-resource.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="circuit-id" type="xs:string" minOccurs="0">
+        <xs:element name="cvlan" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Circuit id")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the cvlan of this allotted-resource.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="purpose" type="xs:string" minOccurs="0">
+        <xs:element name="vpn-name" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Reason for this entity, role it is playing")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the vpn-name of this allotted-resource.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
+        <xs:element ref="tns:tunnel-xconnects" minOccurs="0"/>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="logical-links">
+  <xs:element name="allotted-resources">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of logical connections")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object is used to store slices of services being offered")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:logical-link" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:allotted-resource" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="network-policy">
+  <xs:element name="communication-service-profile">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network",uriTemplate="/network/network-policies/network-policy/{network-policy-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Requirement of comunication service.",uniqueProps="profile-id",indexedProps="profile-id",container="communication-service-profiles",dependentOn="service-instance",uriTemplate="/service-instances/service-instance/{service-instance-id}/communication-service-profiles/communication-service-profile/{profile-id}",searcheable="profile-id")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="network-policy-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID representing unique key to this instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-policy-fqdn" type="xs:string" minOccurs="0">
+        <xs:element name="profile-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Contrail FQDN for the policy")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="ID of the profile.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
+        <xs:element name="max-number-of-UEs" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ID for the openStack Heat instance")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The maximum number of UEs may simultaneously access the communication service")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+        <xs:element name="coverage-area-list" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="A list of TrackingAreas where the NSI can be selected.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="name" type="xs:string" minOccurs="0">
+        <xs:element name="latency" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the policy")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The packet transmission latency (millisecond) through the RAN, CN, and TN part of 5G network and is used to evaluate utilization performance of the end-to-end network slice instance.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="type" type="xs:string" minOccurs="0">
+        <xs:element name="exp-data-rate-UL" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the policy")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="User experience data rate of upload.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="latency" type="xs:int" minOccurs="0">
+        <xs:element name="exp-data-rate-DL" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The packet transmission latency (millisecond) through the Transport slice connections and is used to evaluate utilization performance of the end-to-end network slice instance.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="User experience data rate of download.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="jitter" type="xs:int" minOccurs="0">
+        <xs:element name="ue-mobility-level" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="jitter")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="User mobility level, value can be stationary, nomadic, restricted mobility, fully mobility.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="max-bandwidth" type="xs:int" minOccurs="0">
+        <xs:element name="resource-sharing-level" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The maximum bandwidth (mb) of the connection links in a transport slice instance.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Whether the resources to be allocated to the network slice instance may be shared with another network slice instance(s).")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="reliability" minOccurs="0">
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The reliability requirement for an network slice subnet instance, expressed as a percentage.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
@@ -4077,227 +3990,149 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="network-policies">
+  <xs:element name="communication-service-profiles">
      <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of communication service profile.")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:network-policy" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:communication-service-profile" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="allotted-resource">
+  <xs:element name="service-profile">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description,allotted-resource-name",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role,allotted-resource-name,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,vpn-name,orchestration-status",dependentOn="service-instance",container="allotted-resources",uriTemplate="/allotted-resources/allotted-resource/{id}",requiredProps="id")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Requirement of E2E Slice service.",uniqueProps="profile-id",indexedProps="profile-id",container="service-profiles",dependentOn="service-instance",uriTemplate="/service-instances/service-instance/{service-instance-id}/service-profiles/service-profile/{profile-id}",searcheable="profile-id")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="id" type="xs:string" minOccurs="0">
+        <xs:element name="profile-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>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="ID of the profile.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="description" type="xs:string" minOccurs="0">
+        <xs:element name="latency" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The descriptive information assigned to this allotted resource instance")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The packet transmission latency (millisecond) through the RAN, CN, and TN part of 5G network and is used to evaluate utilization performance of the end-to-end network slice instance.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
+        <xs:element name="max-number-of-UEs" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Link back to more information in the controller")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The maximum number of UEs may simultaneously access the E2E slice service")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
+        <xs:element name="coverage-area-TA-list" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="A list of TrackingAreas where the NSI can be selected.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
+        <xs:element name="ue-mobility-level" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="User mobility level, value can be stationary, nomadic, restricted mobility, fully mobility.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+        <xs:element name="resource-sharing-level" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Whether the resources to be allocated to the network slice instance may be shared with another network slice instance(s).")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
+        <xs:element name="activity-factor" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Percentage value of the amount of simultaneous active UEs to the total number of UEs where active means the UEs are exchanging data with the network.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
+        <xs:element name="jitter" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The jitter requirements of network slice.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="type" type="xs:string" minOccurs="0">
+        <xs:element name="survival-time" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Generic description of the type of allotted resource.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="An attribute specifies the time that an application consuming a communication service may continue without an anticipated message.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="role" type="xs:string" minOccurs="0">
+        <xs:element name="availability" type="xs:float" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="role in the network that this resource will be providing.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This parameter specifies the availability requirement, expressed as a percentage.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="allotted-resource-name" type="xs:string" minOccurs="0">
+        <xs:element name="reliability" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the name of this allotted-resource.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="An attribute specifies in the context of network layer packet transmissions, percentage value of the amount of sent network layer packets successfully delivered to a given system entity within the time constraint required by the targeted service, divided by the total number of sent network layer packets.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="access-provider-id" type="xs:string" minOccurs="0">
+        <xs:element name="dl-thpt-per-slice" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access provider of this allotted-resource.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This attribute defines achievable data rate of the network slice in downlink that is available ubiquitously across the coverage area of the slice.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="access-client-id" type="xs:string" minOccurs="0">
+        <xs:element name="dl-thpt-per-UE" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access client of this allotted-resource.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This attribute defines downlink data rate supported by the network slice per UE.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="access-topology-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access topology of this allotted-resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="access-node-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access node of this allotted-resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="access-ltp-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access ltp of this allotted-resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cvlan" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the cvlan of this allotted-resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the vpn-name of this allotted-resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:tunnel-xconnects" minOccurs="0"/>
-        <xs:element ref="tns:logical-links" minOccurs="0"/>
-        <xs:element ref="tns:network-policies" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="allotted-resources">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object is used to store slices of services being offered")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:allotted-resource" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="communication-service-profile">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Requirement of comunication service.",uniqueProps="profile-id",indexedProps="profile-id",container="communication-service-profiles",dependentOn="service-instance",uriTemplate="/service-instances/service-instance/{service-instance-id}/communication-service-profiles/communication-service-profile/{profile-id}",searcheable="profile-id")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="profile-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="ID of the profile.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="max-number-of-UEs" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The maximum number of UEs may simultaneously access the communication service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="coverage-area-list" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="A list of TrackingAreas where the NSI can be selected.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="latency" type="xs:int" minOccurs="0">
+        <xs:element name="ul-thpt-per-slice" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The packet transmission latency (millisecond) through the RAN, CN, and TN part of 5G network and is used to evaluate utilization performance of the end-to-end network slice instance.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This attribute defines achievable data rate of the network slice in uplink that is available ubiquitously across the coverage area of the slice.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="exp-data-rate-UL" type="xs:int" minOccurs="0">
+        <xs:element name="ul-thpt-per-UE" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="User experience data rate of upload.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This attribute defines uplink data rate supported by the network slice per UE.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="exp-data-rate-DL" type="xs:int" minOccurs="0">
+        <xs:element name="max-pkt-size" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="User experience data rate of download.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This parameter specifies the maximum packet size supported by the network slice.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="ue-mobility-level" type="xs:string" minOccurs="0">
+        <xs:element name="max-number-of-conns" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="User mobility level, value can be stationary, nomadic, restricted mobility, fully mobility.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This parameter defines the maximum number of concurrent sessions supported by the network slice.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="resource-sharing-level" type="xs:string" minOccurs="0">
+        <xs:element name="term-density" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Whether the resources to be allocated to the network slice instance may be shared with another network slice instance(s).")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="An attribute specifies the overall user density over the coverage area of the network slice.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
@@ -4312,23 +4147,23 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="communication-service-profiles">
+  <xs:element name="service-profiles">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of communication service profile.")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of E2E slice service profile.")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:communication-service-profile" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:service-profile" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="service-profile">
+  <xs:element name="slice-profile">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Requirement of E2E Slice service.",uniqueProps="profile-id",indexedProps="profile-id",container="service-profiles",dependentOn="service-instance",uriTemplate="/service-instances/service-instance/{service-instance-id}/service-profiles/service-profile/{profile-id}",searcheable="profile-id")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Requirement of network slice subnet service.",uniqueProps="profile-id",indexedProps="profile-id",container="slice-profiles",dependentOn="service-instance",uriTemplate="/service-instances/service-instance/{service-instance-id}/slice-profiles/slice-profile/{profile-id}",searcheable="profile-id")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
@@ -4342,21 +4177,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
          <xs:element name="latency" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The packet transmission latency (millisecond) through the RAN, CN, and TN part of 5G network and is used to evaluate utilization performance of the end-to-end network slice instance.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The packet transmission latency (millisecond) through the RAN or CN or TN and is used to evaluate utilization performance of the end-to-end network slice instance.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
          <xs:element name="max-number-of-UEs" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The maximum number of UEs may simultaneously access the E2E slice service")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The maximum number of UEs may simultaneously access the slice subnet service")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
          <xs:element name="coverage-area-TA-list" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="A list of TrackingAreas where the NSI can be selected.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="A list of TrackingAreas where the NSSI can be selected.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
@@ -4370,7 +4205,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
          <xs:element name="resource-sharing-level" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Whether the resources to be allocated to the network slice instance may be shared with another network slice instance(s).")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Whether the resources to be allocated to the slice subnet instance may be shared with another network slice instance(s).")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
@@ -4405,56 +4240,77 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
          <xs:element name="activity-factor" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The activity factor.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="An attribute specfies the percentage value of the amount of simultaneous active UEs to the total number of UEs where active means the UEs are exchanging data with the network.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
          <xs:element name="jitter" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="jitter")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The jitter requirements of network slice subnet.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="survival-time" type="xs:int" minOccurs="0">
+        <xs:element name="survival-time" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Survival Time")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Survival time for network slice subnet.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="cs-availability" minOccurs="0">
+        <xs:element name="cs-availability-target" type="xs:float" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The availability requirement for an network slice instance, expressed as a percentage.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Communication service availability target value.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="reliability" minOccurs="0">
+        <xs:element name="max-bandwidth" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The reliability requirement for an network slice instance, expressed as a percentage.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Maxmun bandwidth value of TN network.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
          <xs:element name="exp-data-rate" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="User experience data rate.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Expected date rate for uRLLC.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="max-number-of-PDU-session" type="xs:int" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="maxNumberofPDUSession Integer 1 The maximum number of PDU sessions that can simultaneously/concurrently access to the network slice.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="overall-user-density" type="xs:int" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Overall User Density.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="cs-reliability-mean-time" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Communication service reliability mean time between failures.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="traffic-density" type="xs:int" minOccurs="0">
+        <xs:element name="msg-size-byte" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="traffic density")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Message size(byte) .")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="conn-density" type="xs:int" minOccurs="0">
+        <xs:element name="transfer-interval-target" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="connection density")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="transferIntervalTarget String 1 Target value of transfer interval.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
@@ -4469,573 +4325,684 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="service-profiles">
+  <xs:element name="slice-profiles">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of E2E slice service profile.")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of slice subnet service profile.")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:service-profile" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:slice-profile" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="slice-profile">
+  <xs:element name="service-instance">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Requirement of network slice subnet service.",uniqueProps="profile-id",indexedProps="profile-id",container="slice-profiles",dependentOn="service-instance",uriTemplate="/service-instances/service-instance/{service-instance-id}/slice-profiles/slice-profile/{profile-id}",searcheable="profile-id")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name,operational-status",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}",requiredProps="service-instance-id")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="profile-id" type="xs:string" minOccurs="0">
+        <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="ID of the profile.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this instance of a service")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="latency" type="xs:int" minOccurs="0">
+        <xs:element name="service-instance-name" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The packet transmission latency (millisecond) through the RAN or CN or TN and is used to evaluate utilization performance of the end-to-end network slice instance.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This field will store a name assigned to the service-instance.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="max-number-of-UEs" type="xs:int" minOccurs="0">
+        <xs:element name="service-type" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The maximum number of UEs may simultaneously access the slice subnet service")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of service.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="coverage-area-TA-list" type="xs:string" minOccurs="0">
+        <xs:element name="service-role" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="A list of TrackingAreas where the NSSI can be selected.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing the service role.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="ue-mobility-level" type="xs:string" minOccurs="0">
+        <xs:element name="service-rate" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="User mobility level, value can be stationary, nomadic, restricted mobility, fully mobility.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Rate of the service instance.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="resource-sharing-level" type="xs:string" minOccurs="0">
+        <xs:element name="service-layer" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Whether the resources to be allocated to the slice subnet instance may be shared with another network slice instance(s).")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Definition of the service layer.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="exp-data-rate-UL" type="xs:int" minOccurs="0">
+        <xs:element name="due-date" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="User experience data rate of upload.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Due date of the service creation.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="exp-data-rate-DL" type="xs:int" minOccurs="0">
+        <xs:element name="end-date" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="User experience data rate of download.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="End date of the service creation.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="area-traffic-cap-UL" type="xs:int" minOccurs="0">
+        <xs:element name="environment-context" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The area traffic capbility of upload.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This field will store the environment context assigned to the service-instance.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="area-traffic-cap-DL" type="xs:int" minOccurs="0">
+        <xs:element name="workload-context" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The area traffic capbility of download.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This field will store the workload context assigned to the service-instance.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="activity-factor" type="xs:int" minOccurs="0">
+        <xs:element name="created-at" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The activity factor.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="create time of Network Service.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="e2e-latency" type="xs:int" minOccurs="0">
+        <xs:element name="updated-at" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="e2e latency")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="last update of Network Service.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="jitter" type="xs:int" minOccurs="0">
+        <xs:element name="description" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="jitter")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="short description for service-instance.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="survival-time" type="xs:int" minOccurs="0">
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Survival Time")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="cs-availability" minOccurs="0">
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The availability requirement for an network slice subnet instance, expressed as a percentage.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="max-bandwidth" type="xs:int" minOccurs="0">
+        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The maximum bandwidth (mb) of the connection links in a transport slice instance.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="reliability" minOccurs="0">
+        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The reliability requirement for an network slice subnet instance, expressed as a percentage.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="exp-data-rate" type="xs:int" minOccurs="0">
+        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="User experience data rate.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="bandwidth-total" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates the total bandwidth to be used for this service.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="payload-size" type="xs:int" minOccurs="0">
+        <xs:element name="vhn-portal-url" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="payload size.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL customers will use to access the vHN Portal.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="traffic-density" type="xs:int" minOccurs="0">
+        <xs:element name="service-instance-location-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="traffic density")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="An identifier that customers assign to the location where this service is being used.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="conn-density" type="xs:int" minOccurs="0">
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="connection density")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="service-area-dimension" type="xs:string" minOccurs="0">
+        <xs:element name="selflink" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="service area dimension")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="s-nssai" type="xs:string" minOccurs="0">
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="S-NSSAI")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this service.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+        <xs:element name="input-parameters" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing request parameters from SO to pass to Closed Loop.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="service-function" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing function of the service.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
+        <xs:element ref="tns:metadata" minOccurs="0"/>
+        <xs:element ref="tns:allotted-resources" minOccurs="0"/>
+        <xs:element ref="tns:communication-service-profiles" minOccurs="0"/>
+        <xs:element ref="tns:service-profiles" minOccurs="0"/>
+        <xs:element ref="tns:slice-profiles" minOccurs="0"/>
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path.",suggestibleOnSearch="true")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="slice-profiles">
+  <xs:element name="service-instances">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of slice subnet service profile.")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of service instances")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:slice-profile" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:service-instance" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="ip-address">
+  <xs:element name="service-subscription">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IP address.",uniqueProps="ip-address",indexedProps="ip-address",container="ip-address-list",uriTemplate="/endpoints/endpoint/{endpoint-id}/ip-address-list/ip-address/{ip-address}",searcheable="ip-address")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type",uriTemplate="/service-subscriptions/service-subscription/{service-type}",requiredProps="service-type")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="ip-address" type="xs:string" minOccurs="0">
+        <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="IP address.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Value defined by orchestration to identify this service across ONAP.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="ip-address-end" type="xs:string" minOccurs="0">
+        <xs:element name="temp-ub-sub-account-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IP address end range.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This property will be deleted from A&amp;AI in the near future. Only stop gap solution.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IP version, either 4 or 6.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="type" type="xs:string" minOccurs="0">
+        <xs:element ref="tns:service-instances" minOccurs="0"/>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="service-subscriptions">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of objects that group service instances.")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:service-subscription" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="customer">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business",uriTemplate="/business/customers/customer/{global-customer-id}",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" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of IP address, eg., Reserved, Static, DHCP.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Global customer id used across ONAP to uniquely identify customer.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="assignment" type="xs:string" minOccurs="0">
+        <xs:element name="subscriber-name" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="assignment.")</annox:annotate>
+              <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="operator" type="xs:string" minOccurs="0">
+        <xs:element name="subscriber-type" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operator to apply to the port (greater than, less than, etc).")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Subscriber type, a way to provide VID with only the INFRA customers.",defaultValue="CUST")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="length" type="xs:int" minOccurs="0">
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ip-address prefix length, 32 for single address.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
+        <xs:element ref="tns:service-subscriptions" minOccurs="0"/>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="ip-address-list">
+  <xs:element name="customers">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="List of IP addresses.")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:ip-address" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:customer" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="endpoint">
+  <xs:element name="line-of-business">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Endpoint object.",uniqueProps="endpoint-id",indexedProps="endpoint-id",container="endpoints",uriTemplate="/endpoints/endpoint/{endpoint-id}",searcheable="endpoint-id",requiredProps="endpoint-id")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a line-of-business",indexedProps="line-of-business-name",uniqueProps="line-of-business-name",container="lines-of-business",namespace="business",uriTemplate="/business/lines-of-business/line-of-business/{line-of-business-name}",requiredProps="line-of-business-name")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="endpoint-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="ID of an endpoint.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="endpoint-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of an endpoint.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="endpoint-type" type="xs:string" minOccurs="0">
+        <xs:element name="line-of-business-name" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of an endpoint.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the line-of-business (product)")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="logical-interface-id" type="xs:string" minOccurs="0">
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Identity of a logical interface, e.g., VLAN ID.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element ref="tns:ip-address-list" minOccurs="0"/>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="endpoints">
+  <xs:element name="lines-of-business">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Endpoint objects.")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of lines-of-business")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:endpoint" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:line-of-business" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="service-instance">
+  <xs:element name="owning-entity">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name,operational-status",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}",requiredProps="service-instance-id")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes an owning-entity",indexedProps="owning-entity-id,owning-entity-name",searchable="owning-entity-id",uniqueProps="owning-entity-id,owning-entity-name",container="owning-entities",namespace="business",uriTemplate="/business/owning-entities/owning-entity/{owning-entity-id}",requiredProps="owning-entity-id,owning-entity-name")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="service-instance-id" type="xs:string" minOccurs="0">
+        <xs:element name="owning-entity-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this instance of a service")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of an owning entity")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="service-instance-name" type="xs:string" minOccurs="0">
+        <xs:element name="owning-entity-name" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This field will store a name assigned to the service-instance.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Owning entity name")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="service-type" type="xs:string" minOccurs="0">
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of service.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="service-role" type="xs:string" minOccurs="0">
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="owning-entities">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of owning-entities")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:owning-entity" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="platform">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a platform",indexedProps="platform-name",uniqueProps="platform-name",container="platforms",namespace="business",uriTemplate="/business/platforms/platform/{platform-name}",requiredProps="platform-name")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="platform-name" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing the service role.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the platform")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="service-rate" type="xs:string" minOccurs="0">
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Rate of the service instance.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="service-layer" type="xs:string" minOccurs="0">
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="platforms">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of platforms")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:platform" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="project">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes the project",indexedProps="project-name",uniqueProps="project-name",container="projects",namespace="business",uriTemplate="/business/projects/project/{project-name}",requiredProps="project-name")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="project-name" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Definition of the service layer.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the project deploying a service")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="due-date" type="xs:string" minOccurs="0">
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Due date of the service creation.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="end-date" type="xs:string" minOccurs="0">
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="projects">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of projects")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:project" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="sp-partner">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an sp-partner",indexedProps="sp-partner-id,url,callsource,model-invariant-id,model-version-id",nameProps="sp-partner-id",searchable="sp-partner-id",uniqueProps="sp-partner-id",container="sp-partners",namespace="business",uriTemplate="/business/sp-partners/sp-partner/{sp-partner-id}",requiredProps="sp-partner-id")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="sp-partner-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="End date of the service creation.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this sp-partner by id")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="environment-context" type="xs:string" minOccurs="0">
+        <xs:element name="url" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This field will store the environment context assigned to the service-instance.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the URL of this sp-partner.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="workload-context" type="xs:string" minOccurs="0">
+        <xs:element name="callsource" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This field will store the workload context assigned to the service-instance.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the callsource of this sp-partner.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="created-at" type="xs:string" minOccurs="0">
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="create time of Network Service.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="updated-at" type="xs:string" minOccurs="0">
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="last update of Network Service.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this sp-partner.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="description" type="xs:string" minOccurs="0">
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="short description for service-instance.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this sp-partner.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
          <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this sp-partner model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
          <xs:element name="model-version-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this sp-partner model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="sp-partners">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of sp-partners")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:sp-partner" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="business">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for business related constructs")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:connectors" minOccurs="0"/>
+        <xs:element ref="tns:customers" minOccurs="0"/>
+        <xs:element ref="tns:lines-of-business" minOccurs="0"/>
+        <xs:element ref="tns:owning-entities" minOccurs="0"/>
+        <xs:element ref="tns:platforms" minOccurs="0"/>
+        <xs:element ref="tns:projects" minOccurs="0"/>
+        <xs:element ref="tns:sp-partners" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="vnf-image">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}",requiredProps="vnf-image-uuid,application,application-vendor")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="vnf-image-uuid" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
+              <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="widget-model-id" type="xs:string" minOccurs="0">
+        <xs:element name="application" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
+              <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="widget-model-version" type="xs:string" minOccurs="0">
+        <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 ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="bandwidth-total" type="xs:string" minOccurs="0">
+        <xs:element name="application-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates the total bandwidth to be used for this service.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="vhn-portal-url" type="xs:string" minOccurs="0">
+        <xs:element name="selflink" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL customers will use to access the vHN Portal.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="service-instance-location-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="An identifier that customers assign to the location where this service is being used.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
                <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of this service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="input-parameters" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing request parameters from SO to pass to Closed Loop.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-function" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing function of the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-        <xs:element ref="tns:allotted-resources" minOccurs="0"/>
-        <xs:element ref="tns:communication-service-profiles" minOccurs="0"/>
-        <xs:element ref="tns:service-profiles" minOccurs="0"/>
-        <xs:element ref="tns:slice-profiles" minOccurs="0"/>
-        <xs:element ref="tns:endpoints" minOccurs="0"/>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path.",suggestibleOnSearch="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="service-instances">
+  <xs:element name="vnf-images">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of service instances")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge.")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:service-instance" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:vnf-image" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="service-subscription">
+  <xs:element name="service">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type",uriTemplate="/service-subscriptions/service-subscription/{service-type}",requiredProps="service-type")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/services/service/{service-id}",requiredProps="service-id,service-description")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="service-type" type="xs:string" minOccurs="0">
+        <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="Value defined by orchestration to identify this service across ONAP.")</annox:annotate>
+              <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="temp-ub-sub-account-id" type="xs:string" minOccurs="0">
+        <xs:element name="service-description" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This property will be deleted from A&amp;AI in the near future. Only stop gap solution.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Description of the service")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="service-selflink" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
@@ -5046,49 +5013,48 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element ref="tns:service-instances" minOccurs="0"/>
+        <xs:element name="service-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="service version")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="service-subscriptions">
+  <xs:element name="services">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of objects that group service instances.")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC.")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:service-subscription" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:service" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="customer">
+  <xs:element name="service-capability">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business",uriTemplate="/business/customers/customer/{global-customer-id}",requiredProps="global-customer-id,subscriber-name,subscriber-type")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}",requiredProps="service-type,vnf-type")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="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 ONAP to uniquely identify customer.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="subscriber-name" type="xs:string" minOccurs="0">
+        <xs:element name="service-type" 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>
+              <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="subscriber-type" type="xs:string" minOccurs="0">
+        <xs:element name="vnf-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>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="String capturing type of vnf, that was intended to identify the SDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ONAP matures.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
@@ -5099,121 +5065,99 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element ref="tns:service-subscriptions" minOccurs="0"/>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="customers">
+  <xs:element name="service-capabilities">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of service capabilities.")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:customer" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:service-capability" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="line-of-business">
+  <xs:element name="element-choice-set">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a line-of-business",indexedProps="line-of-business-name",uniqueProps="line-of-business-name",container="lines-of-business",namespace="business",uriTemplate="/business/lines-of-business/line-of-business/{line-of-business-name}",requiredProps="line-of-business-name")</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",dependentOn="constrained-element-set",container="element-choice-sets",uriTemplate="/element-choice-sets/element-choice-set/{element-choice-set-uuid}",requiredProps="element-choice-set-uuid,element-choice-set-name")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="line-of-business-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the line-of-business (product)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+        <xs:element name="element-choice-set-uuid" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
+        <xs:element name="element-choice-set-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="cardinality" type="xs:string" minOccurs="0"/>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
+        <xs:element ref="tns:model-elements" minOccurs="0"/>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="lines-of-business">
+  <xs:element name="element-choice-sets">
      <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of lines-of-business")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:line-of-business" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:element-choice-set" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="owning-entity">
+  <xs:element name="constrained-element-set">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes an owning-entity",indexedProps="owning-entity-id,owning-entity-name",searchable="owning-entity-id",uniqueProps="owning-entity-id,owning-entity-name",container="owning-entities",namespace="business",uriTemplate="/business/owning-entities/owning-entity/{owning-entity-id}",requiredProps="owning-entity-id,owning-entity-name")</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",dependentOn="model-constraint,model-element",container="constrained-element-sets",uriTemplate="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}",requiredProps="constrained-element-set-uuid,constraint-type,check-type")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="owning-entity-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of an owning entity")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="owning-entity-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Owning entity name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+        <xs:element name="constrained-element-set-uuid" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
+        <xs:element name="constraint-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="check-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
+        <xs:element ref="tns:element-choice-sets" minOccurs="0"/>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="owning-entities">
+  <xs:element name="constrained-element-sets">
      <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of owning-entities")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:owning-entity" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:constrained-element-set" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="platform">
+  <xs:element name="model-constraint">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a platform",indexedProps="platform-name",uniqueProps="platform-name",container="platforms",namespace="business",uriTemplate="/business/platforms/platform/{platform-name}",requiredProps="platform-name")</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",dependentOn="model-element",container="model-constraints",uriTemplate="/model-constraints/model-constraint/{model-constraint-uuid}",requiredProps="model-constraint-uuid,constrained-element-set-uuid-to-replace")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="platform-name" type="xs:string" minOccurs="0">
+        <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,description="Name of the platform")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
+        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string" minOccurs="0"/>
+        <xs:element ref="tns:constrained-element-sets" minOccurs="0"/>
          <xs:element name="resource-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
@@ -5221,37 +5165,46 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="platforms">
+  <xs:element name="model-constraints">
      <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of platforms")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:platform" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:model-constraint" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="project">
+  <xs:element name="model-element">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes the project",indexedProps="project-name",uniqueProps="project-name",container="projects",namespace="business",uriTemplate="/business/projects/project/{project-name}",requiredProps="project-name")</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",dependentOn="element-choice-set,model-element,model-ver",allowDirectWrite="false",container="model-elements",uriTemplate="/model-elements/model-element/{model-element-uuid}",requiredProps="model-element-uuid,new-data-del-flag,cardinality")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="project-name" type="xs:string" minOccurs="0">
+        <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,description="Name of the project deploying a service")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="new-data-del-flag" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates whether this element was created as part of instantiation from this model")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="cardinality" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="How many of this type of element are required/allowed")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
+        <xs:element name="linkage-points" type="xs:string" minOccurs="0" maxOccurs="5000"/>
          <xs:element name="resource-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
@@ -5259,160 +5212,134 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
+        <xs:element ref="tns:model-elements" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:model-constraints" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Describes new constraints on this model element that are not part of that model's definition")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="projects">
+  <xs:element name="model-elements">
      <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of projects")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:project" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:model-element" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="sp-partner">
+  <xs:element name="model-ver">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an sp-partner",indexedProps="sp-partner-id,url,callsource,model-invariant-id,model-version-id",nameProps="sp-partner-id",searchable="sp-partner-id",uniqueProps="sp-partner-id",container="sp-partners",namespace="business",uriTemplate="/business/sp-partners/sp-partner/{sp-partner-id}",requiredProps="sp-partner-id")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version,distribution-status",uniqueProps="model-version-id",dependentOn="model",container="model-vers",uriTemplate="/model-vers/model-ver/{model-version-id}",requiredProps="model-version-id,model-name,model-version")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="sp-partner-id" type="xs:string" minOccurs="0">
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this sp-partner by id")</annox:annotate>
+              <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="url" type="xs:string" minOccurs="0">
+        <xs:element name="model-name" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the URL of this sp-partner.")</annox:annotate>
+              <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="callsource" type="xs:string" minOccurs="0">
+        <xs:element name="model-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the callsource of this sp-partner.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+        <xs:element name="distribution-status" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Distribution Status")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
+        <xs:element name="model-description" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this sp-partner.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Description")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
+        <xs:element name="sdnc-model-name" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this sp-partner.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The CDS blue print name associated with the resource.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
+        <xs:element name="sdnc-model-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this sp-partner model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The version of the CDS blue print.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this sp-partner model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
+        <xs:element ref="tns:model-elements" minOccurs="0"/>
+        <xs:element ref="tns:metadata" minOccurs="0"/>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="sp-partners">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of sp-partners")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:sp-partner" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="business">
+  <xs:element name="model-vers">
      <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for business related constructs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:connectors" minOccurs="0"/>
-        <xs:element ref="tns:customers" minOccurs="0"/>
-        <xs:element ref="tns:lines-of-business" minOccurs="0"/>
-        <xs:element ref="tns:owning-entities" minOccurs="0"/>
-        <xs:element ref="tns:platforms" minOccurs="0"/>
-        <xs:element ref="tns:projects" minOccurs="0"/>
-        <xs:element ref="tns:sp-partners" minOccurs="0"/>
+        <xs:element ref="tns:model-ver" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="vnf-image">
+  <xs:element name="model">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}",requiredProps="vnf-image-uuid,application,application-vendor")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/models/model/{model-invariant-id}",requiredProps="model-invariant-id,model-type")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="vnf-image-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of this asset")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-vendor" type="xs:string" minOccurs="0">
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
+              <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="application-version" type="xs:string" minOccurs="0">
+        <xs:element name="model-type" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>
+              <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="selflink" type="xs:string" minOccurs="0">
+        <xs:element name="model-role" 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>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Role of the model,e.g.,NST,NSST,CST,etc")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
@@ -5423,250 +5350,242 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
+        <xs:element ref="tns:model-vers" minOccurs="0"/>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="vnf-images">
+  <xs:element name="models">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge.")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:vnf-image" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:model" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="service">
+  <xs:element name="related-lookup">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/services/service/{service-id}",requiredProps="service-id,service-description")</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",dependentOn="named-query-element",container="related-lookups",requiredProps="related-lookup-uuid,source-node-type,source-node-property,target-node-type,target-node-property",uriTemplate="/related-lookups/related-lookup/{related-lookup-uuid}")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Description of the service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-version" type="xs:string" minOccurs="0">
+        <xs:element name="related-lookup-uuid" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="service version")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
+        <xs:element name="source-node-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="source-node-property" type="xs:string" minOccurs="0"/>
+        <xs:element name="target-node-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="target-node-property" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="5000"/>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="services">
+  <xs:element name="related-lookups">
      <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:service" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:related-lookup" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="service-capability">
+  <xs:element name="property-constraint">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}",requiredProps="service-type,vnf-type")</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",dependentOn="named-query-element",container="property-constraints",requiredProps="property-constraint-uuid,constraint-type,property-name,property-value",uriTemplate="/property-constraints/property-constraint/{property-constraint-uuid}")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="service-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="String capturing type of vnf, that was intended to identify the SDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ONAP matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+        <xs:element name="property-constraint-uuid" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+        <xs:element name="constraint-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="service-capabilities">
+  <xs:element name="property-constraints">
      <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of service capabilities.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:service-capability" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:property-constraint" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="element-choice-set">
+  <xs:element name="named-query-element">
      <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",dependentOn="constrained-element-set",container="element-choice-sets",uriTemplate="/element-choice-sets/element-choice-set/{element-choice-set-uuid}",requiredProps="element-choice-set-uuid,element-choice-set-name")</annox:annotate>
+          <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",dependentOn="named-query,named-query-element",container="named-query-elements",requiredProps="named-query-element-uuid",uriTemplate="/named-query-elements/named-query-element/{named-query-element-uuid}")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="element-choice-set-uuid" type="xs:string" minOccurs="0">
+        <xs:element name="named-query-element-uuid" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
                <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="element-choice-set-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="cardinality" 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:model-elements" minOccurs="0"/>
+        <xs:element name="property-limit-desc" type="xs:string" minOccurs="0"/>
+        <xs:element name="do-not-output" type="xs:string" minOccurs="0"/>
+        <xs:element ref="tns:named-query-elements" minOccurs="0"/>
+        <xs:element ref="tns:related-lookups" minOccurs="0"/>
+        <xs:element ref="tns:property-constraints" minOccurs="0"/>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="element-choice-sets">
+  <xs:element name="named-query-elements">
      <xs:complexType>
        <xs:sequence>
-        <xs:element ref="tns:element-choice-set" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:named-query-element" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="constrained-element-set">
+  <xs:element name="named-query">
      <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",dependentOn="model-constraint,model-element",container="constrained-element-sets",uriTemplate="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}",requiredProps="constrained-element-set-uuid,constraint-type,check-type")</annox:annotate>
+          <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",uriTemplate="/service-design-and-creation/named-queries/named-query/{named-query-uuid}")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="constrained-element-set-uuid" type="xs:string" minOccurs="0">
+        <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,autoGenerateUuid="true")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="constraint-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="check-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="named-query-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="named-query-version" type="xs:string" minOccurs="0"/>
+        <xs:element name="required-input-params" minOccurs="0">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="required-input-param" type="xs:string" minOccurs="0" maxOccurs="5000"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="description" type="xs:string" minOccurs="0"/>
          <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:element-choice-sets" minOccurs="0"/>
+        <xs:element ref="tns:named-query-elements" minOccurs="0"/>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="constrained-element-sets">
+  <xs:element name="named-queries">
      <xs:complexType>
        <xs:sequence>
-        <xs:element ref="tns:constrained-element-set" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:named-query" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="model-constraint">
+  <xs:element name="service-design-and-creation">
      <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",dependentOn="model-element",container="model-constraints",uriTemplate="/model-constraints/model-constraint/{model-constraint-uuid}",requiredProps="model-constraint-uuid,constrained-element-set-uuid-to-replace")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for objects managed by ASDC")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="model-constraint-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:constrained-element-sets" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-constraints">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:model-constraint" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:vnf-images" minOccurs="0"/>
+        <xs:element ref="tns:services" minOccurs="0"/>
+        <xs:element ref="tns:service-capabilities" minOccurs="0"/>
+        <xs:element ref="tns:models" minOccurs="0"/>
+        <xs:element ref="tns:named-queries" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="model-element">
+  <xs:element name="logical-link">
      <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",dependentOn="element-choice-set,model-element,model-ver",allowDirectWrite="false",container="model-elements",uriTemplate="/model-elements/model-element/{model-element-uuid}",requiredProps="model-element-uuid,new-data-del-flag,cardinality")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,link-type,purpose,operational-status",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",uriTemplate="/network/logical-links/logical-link/{link-name}",requiredProps="link-name,in-maint,link-type")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="model-element-uuid" type="xs:string" minOccurs="0">
+        <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,autoGenerateUuid="true")</annox:annotate>
+              <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="new-data-del-flag" type="xs:string" minOccurs="0">
+        <xs:element name="in-maint" type="xs:boolean" 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>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="cardinality" type="xs:string" minOccurs="0">
+        <xs:element name="link-type" 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>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of logical link, e.g., evc")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="speed-value" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="speed-units" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="available-capacity" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="admin-state" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the administrative state of the link")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ip-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="v4, v6, or ds for dual stack")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="routing-protocol" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="For example, static or BGP")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="linkage-points" type="xs:string" minOccurs="0" maxOccurs="5000"/>
          <xs:element name="resource-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
@@ -5674,134 +5593,125 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element ref="tns:model-elements" minOccurs="0">
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element ref="tns:model-constraints" minOccurs="0">
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Describes new constraints on this model element that are not part of that model's definition")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-elements">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:model-element" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-ver">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version,distribution-status",uniqueProps="model-version-id",dependentOn="model",container="model-vers",uriTemplate="/model-vers/model-ver/{model-version-id}",requiredProps="model-version-id,model-name,model-version")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
+        <xs:element name="widget-model-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>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-name" type="xs:string" minOccurs="0">
+        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-version" type="xs:string" minOccurs="0">
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indication of operational status of the logical link.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="distribution-status" type="xs:string" minOccurs="0">
+        <xs:element name="prov-status" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Distribution Status")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-description" type="xs:string" minOccurs="0">
+        <xs:element name="link-role" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Description")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indication of the network use of the logical link.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="sdnc-model-name" type="xs:string" minOccurs="0">
+        <xs:element name="link-name2" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The CDS blue print name associated with the resource.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Alias or alternate name (CLCI or D1 name).")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="sdnc-model-version" type="xs:string" minOccurs="0">
+        <xs:element name="link-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The version of the CDS blue print.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="UUID of the logical-link, SDNC generates this.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+        <xs:element name="circuit-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Circuit id")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="purpose" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Reason for this entity, role it is playing")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element ref="tns:model-elements" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="model-vers">
+  <xs:element name="logical-links">
      <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of logical connections")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:model-ver" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:logical-link" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="model">
+  <xs:element name="class-of-service">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/models/model/{model-invariant-id}",requiredProps="model-invariant-id,model-type")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service",uriTemplate="/classes-of-service/class-of-service/{cos}")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
+        <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 corresponding to the main definition of a model in ASDC")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-type" type="xs:string" minOccurs="0">
+        <xs:element name="probe-id" 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>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="identifier of probe")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-role" type="xs:string" minOccurs="0">
+        <xs:element name="probe-type" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Role of the model,e.g.,NST,NSST,CST,etc")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="type of probe")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
@@ -5812,197 +5722,200 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element ref="tns:model-vers" minOccurs="0"/>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="models">
+  <xs:element name="classes-of-service">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="class-of-service of probe")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:model" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:class-of-service" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="related-lookup">
+  <xs:element name="site-pair">
      <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",dependentOn="named-query-element",container="related-lookups",requiredProps="related-lookup-uuid,source-node-type,source-node-property,target-node-type,target-node-property",uriTemplate="/related-lookups/related-lookup/{related-lookup-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs",uriTemplate="/site-pairs/site-pair/{site-pair-id}")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="related-lookup-uuid" type="xs:string" minOccurs="0">
+        <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,autoGenerateUuid="true")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="source-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 name="source-ip" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prefix address")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="destination-ip" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prefix address")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ip-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ip version, v4, v6")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="destination-hostname" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Hostname of the destination equipment to which SLAs are measured against.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="destination-equip-type" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The type of destinatination equipment. Could be Router, UCPE, etc.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:classes-of-service" minOccurs="0"/>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="related-lookups">
+  <xs:element name="site-pairs">
      <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="probe within a set")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:related-lookup" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:site-pair" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="property-constraint">
+  <xs:element name="routing-instance">
      <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",dependentOn="named-query-element",container="property-constraints",requiredProps="property-constraint-uuid,constraint-type,property-name,property-value",uriTemplate="/property-constraints/property-constraint/{property-constraint-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances",uriTemplate="/routing-instances/routing-instance/{routing-instance-id}")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="property-constraint-uuid" type="xs:string" minOccurs="0">
+        <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,autoGenerateUuid="true")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of routing instance")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="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:element name="rpm-owner" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="rpm owner")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:site-pairs" minOccurs="0"/>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="property-constraints">
+  <xs:element name="routing-instances">
      <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="set of probes related to generic-vnf routing instance")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:property-constraint" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:routing-instance" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="named-query-element">
+  <xs:element name="site-pair-set">
      <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",dependentOn="named-query,named-query-element",container="named-query-elements",requiredProps="named-query-element-uuid",uriTemplate="/named-query-elements/named-query-element/{named-query-element-uuid}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network",uriTemplate="/network/site-pair-sets/site-pair-set/{site-pair-set-id}",requiredProps="site-pair-set-id")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="named-query-element-uuid" type="xs:string" minOccurs="0">
+        <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,autoGenerateUuid="true")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of site pair set.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="5000"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-limit-desc" type="xs:string" minOccurs="0"/>
-        <xs:element name="do-not-output" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:named-query-elements" minOccurs="0"/>
-        <xs:element ref="tns:related-lookups" minOccurs="0"/>
-        <xs:element ref="tns:property-constraints" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-query-elements">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:named-query-element" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-query">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation",requiredProps="named-query-uuid,named-query-name,named-query-version",uriTemplate="/service-design-and-creation/named-queries/named-query/{named-query-uuid}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="named-query-uuid" type="xs:string" minOccurs="0">
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true)</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="named-query-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="named-query-version" type="xs:string" minOccurs="0"/>
-        <xs:element name="required-input-params" minOccurs="0">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="required-input-param" type="xs:string" minOccurs="0" maxOccurs="5000"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="description" type="xs:string" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:named-query-elements" minOccurs="0"/>
+        <xs:element ref="tns:routing-instances" minOccurs="0"/>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="named-queries">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:named-query" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-design-and-creation">
+  <xs:element name="site-pair-sets">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for objects managed by ASDC")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of sets of instances for probes related to generic-vnf")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:vnf-images" minOccurs="0"/>
-        <xs:element ref="tns:services" minOccurs="0"/>
-        <xs:element ref="tns:service-capabilities" minOccurs="0"/>
-        <xs:element ref="tns:models" minOccurs="0"/>
-        <xs:element ref="tns:named-queries" minOccurs="0"/>
+        <xs:element ref="tns:site-pair-set" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="class-of-service">
+  <xs:element name="route-target">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service",uriTemplate="/classes-of-service/class-of-service/{cos}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding,vrf",canBeLinked="true",uriTemplate="/route-targets/route-target/{global-route-target}/{route-target-role}",requiredProps="global-route-target,route-target-role")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="cos" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="probe-id" type="xs:string" minOccurs="0">
+        <xs:element name="global-route-target" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="identifier of probe")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Number used to identify an RT, globally unique in the network")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="probe-type" type="xs:string" minOccurs="0">
+        <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="type of probe")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Role assigned to this route target")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
@@ -6017,353 +5930,149 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="classes-of-service">
+  <xs:element name="route-targets">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="class-of-service of probe")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of route target information")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:class-of-service" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:route-target" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="site-pair">
+  <xs:element name="vpn-binding">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs",uriTemplate="/site-pairs/site-pair/{site-pair-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type,access-provider-id,access-client-id,access-topology-id,src-access-node-id,src-access-ltp-id,dst-access-node-id,dst-access-ltp-id,operational-status,model-invariant-id,model-version-id",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}",requiredProps="vpn-id,vpn-name")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="site-pair-id" type="xs:string" minOccurs="0">
+        <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="unique identifier of probe")</annox:annotate>
+              <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="source-ip" type="xs:string" minOccurs="0">
+        <xs:element name="vpn-name" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prefix address")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VPN Name")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="destination-ip" type="xs:string" minOccurs="0">
+        <xs:element name="vpn-platform" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Prefix address")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the platform associated with the VPN example AVPN, Mobility")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
+        <xs:element name="vpn-type" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ip version, v4, v6")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the vpn, should be taken from enumerated/valid values")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="destination-hostname" type="xs:string" minOccurs="0">
+        <xs:element name="vpn-region" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Hostname of the destination equipment to which SLAs are measured against.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="region of customer vpn")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="destination-equip-type" type="xs:string" minOccurs="0">
+        <xs:element name="customer-vpn-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The type of destinatination equipment. Could be Router, UCPE, etc.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="id for this customer vpn")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+        <xs:element name="route-distinguisher" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element ref="tns:classes-of-service" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pairs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="probe within a set")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:site-pair" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="routing-instance">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances",uriTemplate="/routing-instances/routing-instance/{routing-instance-id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="routing-instance-id" type="xs:string" minOccurs="0">
+        <xs:element name="access-provider-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>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access provider of this vpn.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="rpm-owner" type="xs:string" minOccurs="0">
+        <xs:element name="access-client-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="rpm owner")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access client of this vpn.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+        <xs:element name="access-topology-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access topology of this vpn.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element ref="tns:site-pairs" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="routing-instances">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="set of probes related to generic-vnf routing instance")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:routing-instance" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pair-set">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network",uriTemplate="/network/site-pair-sets/site-pair-set/{site-pair-set-id}",requiredProps="site-pair-set-id")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="site-pair-set-id" type="xs:string" minOccurs="0">
+        <xs:element name="src-access-node-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>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the src-access-node of this vpn.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+        <xs:element name="src-access-ltp-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the src-access-ltp of this vpn.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element ref="tns:routing-instances" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pair-sets">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of sets of instances for probes related to generic-vnf")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:site-pair-set" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-target">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding,vrf",canBeLinked="true",uriTemplate="/route-targets/route-target/{global-route-target}/{route-target-role}",requiredProps="global-route-target,route-target-role")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="global-route-target" type="xs:string" minOccurs="0">
+        <xs:element name="dst-access-node-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Number used to identify an RT, globally unique in the network")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the dst-access-node of this vpn.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="route-target-role" type="xs:string" minOccurs="0">
+        <xs:element name="dst-access-ltp-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Role assigned to this route target")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-targets">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of route target information")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:route-target" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpn-binding">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type,access-provider-id,access-client-id,access-topology-id,src-access-node-id,src-access-ltp-id,dst-access-node-id,dst-access-ltp-id,operational-status,model-invariant-id,model-version-id",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}",requiredProps="vpn-id,vpn-name")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vpn-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="VPN ID, globally unique within A&amp;AI")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VPN Name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-platform" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the platform associated with the VPN example AVPN, Mobility")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the vpn, should be taken from enumerated/valid values")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-region" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="region of customer vpn")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="customer-vpn-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="id for this customer vpn")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="route-distinguisher" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="access-provider-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access provider of this vpn.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="access-client-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access client of this vpn.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="access-topology-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access topology of this vpn.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="src-access-node-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the src-access-node of this vpn.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="src-access-ltp-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the src-access-ltp of this vpn.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dst-access-node-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the dst-access-node of this vpn.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dst-access-ltp-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the dst-access-ltp of this vpn.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the dst-access-ltp of this vpn.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
@@ -7605,6 +7314,95 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
        </xs:sequence>
      </xs:complexType>
    </xs:element>
+  <xs:element name="network-policy">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network",uriTemplate="/network/network-policies/network-policy/{network-policy-id}")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="network-policy-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID representing unique key to this instance")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="network-policy-fqdn" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Contrail FQDN for the policy")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ID for the openStack Heat instance")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="name" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the policy")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="type" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the policy")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="latency" type="xs:int" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The packet transmission latency (millisecond) through the Transport slice connections and is used to evaluate utilization performance of the end-to-end network slice instance.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="jitter" type="xs:int" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="jitter")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="max-bandwidth" type="xs:int" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The maximum bandwidth (mb) of the connection links in a transport slice instance.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="reliability" type="xs:float" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The reliability requirement for an network slice subnet instance, expressed as a percentage.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="network-policies">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:network-policy" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
    <xs:element name="vf-module">
      <xs:complexType>
        <xs:annotation>
@@ -10961,191 +10759,109 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="network">
+  <xs:element name="label-restriction">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for network inventory resources.")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an label restriction",indexedProps="id,label-start,label-end,range-bitmap,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="label-restrictions",namespace="network",requiredProps="id",uriTemplate="/network/label-restrictions/label-restriction/{id}")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:logical-links" minOccurs="0"/>
-        <xs:element ref="tns:site-pair-sets" minOccurs="0"/>
-        <xs:element ref="tns:vpn-bindings" minOccurs="0"/>
-        <xs:element ref="tns:vpls-pes" minOccurs="0"/>
-        <xs:element ref="tns:multicast-configurations" minOccurs="0"/>
-        <xs:element ref="tns:vces" minOccurs="0"/>
-        <xs:element ref="tns:vnfcs" minOccurs="0"/>
-        <xs:element ref="tns:l3-networks" minOccurs="0"/>
-        <xs:element ref="tns:network-policies" minOccurs="0"/>
-        <xs:element ref="tns:generic-vnfs" minOccurs="0"/>
-        <xs:element ref="tns:lag-links" minOccurs="0"/>
-        <xs:element ref="tns:newvces" minOccurs="0"/>
-        <xs:element ref="tns:pnfs" minOccurs="0"/>
-        <xs:element ref="tns:physical-links" minOccurs="0"/>
-        <xs:element ref="tns:ipsec-configurations" minOccurs="0"/>
-        <xs:element ref="tns:route-table-references" minOccurs="0"/>
-        <xs:element ref="tns:instance-groups" minOccurs="0"/>
-        <xs:element ref="tns:zones" minOccurs="0"/>
-        <xs:element ref="tns:configurations" minOccurs="0"/>
-        <xs:element ref="tns:forwarding-paths" minOccurs="0"/>
-        <xs:element ref="tns:collections" minOccurs="0"/>
-        <xs:element ref="tns:connectivities" minOccurs="0"/>
-        <xs:element ref="tns:lan-port-configs" minOccurs="0"/>
-        <xs:element ref="tns:network-resources" minOccurs="0"/>
-        <xs:element ref="tns:site-resources" minOccurs="0"/>
-        <xs:element ref="tns:sdwan-vpns" minOccurs="0"/>
-        <xs:element ref="tns:devices" minOccurs="0"/>
-        <xs:element ref="tns:wan-port-configs" minOccurs="0"/>
-        <xs:element ref="tns:ext-aai-networks" minOccurs="0"/>
-        <xs:element ref="tns:fqdns" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="reserved-prop-names">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="last-mod-source-of-truth" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-node-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-created-ts" type="xs:unsignedInt" minOccurs="0"/>
-        <xs:element name="aai-unique-key" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-last-mod-ts" type="xs:unsignedInt" minOccurs="0"/>
-        <xs:element name="source-of-truth" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-uri" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="edge-prop-names">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV",uniqueProps="aai-uuid",indexedProps="aai-uuid")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="edgeLabel" type="xs:string" minOccurs="0"/>
-        <xs:element name="direction" type="xs:string" minOccurs="0"/>
-        <xs:element name="multiplicityRule" type="xs:string" minOccurs="0"/>
-        <xs:element name="contains-other-v" type="xs:string" minOccurs="0"/>
-        <xs:element name="delete-other-v" type="xs:string" minOccurs="0"/>
-        <xs:element name="SVC-INFRA" type="xs:string" minOccurs="0"/>
-        <xs:element name="prevent-delete" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-uuid" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="aai-internal">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:reserved-prop-names" minOccurs="0" maxOccurs="5000"/>
-        <xs:element ref="tns:edge-prop-names" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="contact">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Contacts store the vendor information and have a relationship to the generic-vnf.  In 1902, this will be populated by SDN-GC",uniqueProps="contact-name",container="contacts",namespace="common",nameProps="contact-name,vendor-type",uriTemplate="/common/contacts/contact/{contact-name}",requiredProps="contact-name")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="contact-name" type="xs:string" minOccurs="0">
+        <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="Name of the contact")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the label restriction")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="contact-telephone" type="xs:string" minOccurs="0">
+        <xs:element name="label-start" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Tel no. of contact")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="First number in the label range")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="contact-email" type="xs:string" minOccurs="0">
+        <xs:element name="label-end" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="e-mail of contact")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Last number in the label range")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="vendor-type" type="xs:string" minOccurs="0">
+        <xs:element name="range-bitmap" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="NI (Network Integrator)SI (System Integrator) 3rd Party LCM")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Bitmap of available labels starting from label-start to label-end.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+        <xs:element name="label-step" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Step of labels in label range.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="contacts">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of contacts")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:contact" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="profile">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Profiles store the information (ex, credential-profile) and have a relationship to (ex, pnf)",uniqueProps="profile-name",container="profiles",namespace="common",nameProps="profile-name,profile-type",uriTemplate="/common/profiles/profile/{profile-name}",requiredProps="profile-name")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="profile-name" type="xs:string" minOccurs="0">
+        <xs:element name="inclusive-exclusive" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the profile")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicate wheather range-bitmap items are inclusive or exclusive.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="profile-type" type="xs:string" minOccurs="0">
+        <xs:element name="range-type" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of profile (ex,network-power-profile)")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicate the label range e.g.trib-slot, trib-port")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="profile-characteristics" type="xs:string" minOccurs="0">
+        <xs:element name="trib-slot-granularity" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Set of characteristics of the profile.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicate trib slot granularity.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="profile-subtype" type="xs:string" minOccurs="0">
+        <xs:element name="priority" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Descriptive subtype.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Priority.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="profile-selflink" type="xs:string" minOccurs="0">
+        <xs:element name="selflink" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
@@ -11160,112 +10876,79 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="profiles">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of profiles")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:profile" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="common">
+  <xs:element name="label-restrictions">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for common inventory resources.")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Label Restriction.")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:contacts" minOccurs="0"/>
-        <xs:element ref="tns:profiles" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="notification-event-header">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string" minOccurs="0"/>
-        <xs:element name="timestamp" type="xs:string" minOccurs="0"/>
-        <xs:element name="source-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="domain" type="xs:string" minOccurs="0"/>
-        <xs:element name="sequence-number" type="xs:string" minOccurs="0"/>
-        <xs:element name="severity" type="xs:string" minOccurs="0"/>
-        <xs:element name="event-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="version" type="xs:string" minOccurs="0"/>
-        <xs:element name="action" type="xs:string" minOccurs="0"/>
-        <xs:element name="entity-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="top-entity-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="entity-link" type="xs:string" minOccurs="0"/>
-        <xs:element name="status" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="notification-event">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="cambria.partition" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:notification-event-header" minOccurs="0"/>
+        <xs:element ref="tns:label-restriction" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="overloaded-model">
+  <xs:element name="uni">
      <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",requiredProps="model-invariant-id,model-name-version-id,model-type,model-name,model-id,model-version")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an User network interface",indexedProps="id,tp-id,cvlan,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="unis",namespace="network",requiredProps="id",uriTemplate="/network/unis/uni/{id}")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
+        <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="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the UNI")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-name-version-id" type="xs:string" minOccurs="0">
+        <xs:element name="tp-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>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Termination point ID.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-type" type="xs:string" minOccurs="0">
+        <xs:element name="cvlan" 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>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The cvlan for the site used for ethernet type connectivity.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-name" type="xs:string" minOccurs="0">
+        <xs:element name="selflink" 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>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-id" type="xs:string" minOccurs="0">
+        <xs:element name="operational-status" 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>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-version" type="xs:string" minOccurs="0">
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-description" type="xs:string" minOccurs="0">
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Description")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
@@ -11276,189 +10959,76 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element ref="tns:model-vers" minOccurs="0"/>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="query-parameters">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="QueryParameters for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:named-query" minOccurs="0"/>
-        <xs:element ref="tns:overloaded-model" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-filter">
-    <xs:complexType>
-      <xs:sequence/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-filters">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="InstanceFilters for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:instance-filter" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="secondary-filt">
-    <xs:complexType>
-      <xs:sequence/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="secondary-filts">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SecondaryFilts for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:secondary-filt" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-and-named-query-search">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:query-parameters" minOccurs="0"/>
-        <xs:element ref="tns:instance-filters" minOccurs="0"/>
-        <xs:element ref="tns:secondary-filts" minOccurs="0"/>
-        <xs:element name="top-node-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="secondary-filter-cut-point" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="properties">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Property holder for query properties or instance properties")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="extra-property">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="extra-properties">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Extra properties for inventory item for response list")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:extra-property" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory-response-item">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Inventory item for response list",container="inventory-response-items")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-name" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:extra-properties" minOccurs="0"/>
-        <xs:element ref="tns:inventory-response-items" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory-response-items">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Container for inventory items in response list",container="response-list")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:inventory-response-item" minOccurs="0" maxOccurs="5000"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="response-list">
+  <xs:element name="unis">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Response container for the results of a named-query or model query")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of User network interface.")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:inventory-response-items" minOccurs="0"/>
+        <xs:element ref="tns:uni" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="vnf">
+  <xs:element name="te-link-attribute">
      <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",requiredProps="vnf-id")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an te-link-attribute",indexedProps="id,link-protection-type,access-type,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="te-link-attributes",namespace="network",requiredProps="id",uriTemplate="/network/te-link-attributes/te-link-attribute/{id}")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
+        <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="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the TE link attribute")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="uni">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an User network interface",indexedProps="id,tp-id,cvlan,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="unis",namespace="network",requiredProps="id",uriTemplate="/network/unis/uni/{id}")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string" minOccurs="0">
+        <xs:element name="link-protection-type" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the UNI")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicate desired protection type of the link e.g, unprotected, shared or 1+1")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="tp-id" type="xs:string" minOccurs="0">
+        <xs:element name="access-type" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Termination point ID.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicate link access type e.g, point-to-point or multi-access.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="cvlan" type="xs:string" minOccurs="0">
+        <xs:element name="available-bandwidth" type="xs:int" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The cvlan for the site used for ethernet type connectivity.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Bandwidth available on link.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="odu-type" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The type of ODU e.g, ODU1, ODU2, ODU3, ODU4.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="number" type="xs:int" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The value of available bandwidth.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="is-abstract" type="xs:boolean" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicate wheather link is abstract or native")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
@@ -11508,15 +11078,15 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="unis">
+  <xs:element name="te-link-attributes">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of User network interface.")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of TE link attributes.")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:uni" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:te-link-attribute" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
@@ -11593,60 +11163,74 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="te-link-attribute">
+  <xs:element name="tunnel-termination-point">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an te-link-attribute",indexedProps="id,link-protection-type,access-type,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="te-link-attributes",namespace="network",requiredProps="id",uriTemplate="/network/te-link-attributes/te-link-attribute/{id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an tunnel termination point",indexedProps="ttp-id,tunnel-tp-id,name,operational-status,model-invariant-id,model-version-id",searchable="ttp-id",uniqueProps="ttp-id",container="tunnel-termination-points",namespace="network",requiredProps="ttp-id",uriTemplate="/network/tunnel-termination-points/tunnel-termination-point/{ttp-id}")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="id" type="xs:string" minOccurs="0">
+        <xs:element name="ttp-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the TE link attribute")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the tunnel termination point")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="link-protection-type" type="xs:string" minOccurs="0">
+        <xs:element name="tunnel-tp-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicate desired protection type of the link e.g, unprotected, shared or 1+1")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="TTP ID discovered from controller")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="access-type" type="xs:string" minOccurs="0">
+        <xs:element name="name" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicate link access type e.g, point-to-point or multi-access.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of tunnel termination point")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="available-bandwidth" type="xs:int" minOccurs="0">
+        <xs:element name="admin-status" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Bandwidth available on link.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Admin status of TTP e.g, up,down,testing,preparing-maintenance,maintenance.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="odu-type" type="xs:string" minOccurs="0">
+        <xs:element name="oper-status" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The type of ODU e.g, ODU1, ODU2, ODU3, ODU4.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operational status of TTP e.g, up,down,testing,preparing-maintenance,maintenance.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="number" type="xs:int" minOccurs="0">
+        <xs:element name="switching-capability" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The value of available bandwidth.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicate switching capability of TTP e.g,PSC-1, EVPL,L2SC,TDM,OTN.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="is-abstract" type="xs:boolean" minOccurs="0">
+        <xs:element name="encoding" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicate wheather link is abstract or native")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Encoding support by the TTP e.g, packet,ethernet,PDH,SDH,digital-wrapper,lambda,fiber,ODUK,line.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="protection-type" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicate supported protection type of this TTP e.g, unprotected,reroute,reroute-extra,1-for-n,unidir-1-to-1.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="inter-layer-lock-id" type="xs:int" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="correlation between related objects in ETH and OTN topology.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
@@ -11696,121 +11280,142 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="te-link-attributes">
+  <xs:element name="tunnel-termination-points">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of TE link attributes.")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Tunnel Termination Point.")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:te-link-attribute" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:tunnel-termination-point" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="label-restriction">
+  <xs:element name="network">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an label restriction",indexedProps="id,label-start,label-end,range-bitmap,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="label-restrictions",namespace="network",requiredProps="id",uriTemplate="/network/label-restrictions/label-restriction/{id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for network inventory resources.")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the label restriction")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="label-start" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="First number in the label range")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="label-end" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Last number in the label range")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="range-bitmap" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Bitmap of available labels starting from label-start to label-end.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="label-step" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Step of labels in label range.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="inclusive-exclusive" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicate wheather range-bitmap items are inclusive or exclusive.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="range-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicate the label range e.g.trib-slot, trib-port")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="trib-slot-granularity" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicate trib slot granularity.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="priority" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Priority.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
+        <xs:element ref="tns:logical-links" minOccurs="0"/>
+        <xs:element ref="tns:site-pair-sets" minOccurs="0"/>
+        <xs:element ref="tns:vpn-bindings" minOccurs="0"/>
+        <xs:element ref="tns:vpls-pes" minOccurs="0"/>
+        <xs:element ref="tns:multicast-configurations" minOccurs="0"/>
+        <xs:element ref="tns:vces" minOccurs="0"/>
+        <xs:element ref="tns:vnfcs" minOccurs="0"/>
+        <xs:element ref="tns:l3-networks" minOccurs="0"/>
+        <xs:element ref="tns:network-policies" minOccurs="0"/>
+        <xs:element ref="tns:generic-vnfs" minOccurs="0"/>
+        <xs:element ref="tns:lag-links" minOccurs="0"/>
+        <xs:element ref="tns:newvces" minOccurs="0"/>
+        <xs:element ref="tns:pnfs" minOccurs="0"/>
+        <xs:element ref="tns:physical-links" minOccurs="0"/>
+        <xs:element ref="tns:ipsec-configurations" minOccurs="0"/>
+        <xs:element ref="tns:route-table-references" minOccurs="0"/>
+        <xs:element ref="tns:instance-groups" minOccurs="0"/>
+        <xs:element ref="tns:zones" minOccurs="0"/>
+        <xs:element ref="tns:configurations" minOccurs="0"/>
+        <xs:element ref="tns:forwarding-paths" minOccurs="0"/>
+        <xs:element ref="tns:collections" minOccurs="0"/>
+        <xs:element ref="tns:connectivities" minOccurs="0"/>
+        <xs:element ref="tns:lan-port-configs" minOccurs="0"/>
+        <xs:element ref="tns:network-resources" minOccurs="0"/>
+        <xs:element ref="tns:site-resources" minOccurs="0"/>
+        <xs:element ref="tns:sdwan-vpns" minOccurs="0"/>
+        <xs:element ref="tns:devices" minOccurs="0"/>
+        <xs:element ref="tns:wan-port-configs" minOccurs="0"/>
+        <xs:element ref="tns:ext-aai-networks" minOccurs="0"/>
+        <xs:element ref="tns:fqdns" minOccurs="0"/>
+        <xs:element ref="tns:label-restrictions" minOccurs="0"/>
+        <xs:element ref="tns:unis" minOccurs="0"/>
+        <xs:element ref="tns:te-link-attributes" minOccurs="0"/>
+        <xs:element ref="tns:interlayer-attachments" minOccurs="0"/>
+        <xs:element ref="tns:tunnel-termination-points" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="reserved-prop-names">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="last-mod-source-of-truth" type="xs:string" minOccurs="0"/>
+        <xs:element name="aai-node-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="aai-created-ts" type="xs:unsignedInt" minOccurs="0"/>
+        <xs:element name="aai-unique-key" type="xs:string" minOccurs="0"/>
+        <xs:element name="aai-last-mod-ts" type="xs:unsignedInt" minOccurs="0"/>
+        <xs:element name="source-of-truth" type="xs:string" minOccurs="0"/>
+        <xs:element name="aai-uri" type="xs:string" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="edge-prop-names">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV",uniqueProps="aai-uuid",indexedProps="aai-uuid")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="edgeLabel" type="xs:string" minOccurs="0"/>
+        <xs:element name="direction" type="xs:string" minOccurs="0"/>
+        <xs:element name="multiplicityRule" type="xs:string" minOccurs="0"/>
+        <xs:element name="contains-other-v" type="xs:string" minOccurs="0"/>
+        <xs:element name="delete-other-v" type="xs:string" minOccurs="0"/>
+        <xs:element name="SVC-INFRA" type="xs:string" minOccurs="0"/>
+        <xs:element name="prevent-delete" type="xs:string" minOccurs="0"/>
+        <xs:element name="aai-uuid" type="xs:string" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="aai-internal">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:reserved-prop-names" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:edge-prop-names" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="contact">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Contacts store the vendor information and have a relationship to the generic-vnf.  In 1902, this will be populated by SDN-GC",uniqueProps="contact-name",container="contacts",namespace="common",nameProps="contact-name,vendor-type",uriTemplate="/common/contacts/contact/{contact-name}",requiredProps="contact-name")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="contact-name" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the contact")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
+        <xs:element name="contact-telephone" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Tel no. of contact")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
+        <xs:element name="contact-email" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="e-mail of contact")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
+        <xs:element name="vendor-type" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="NI (Network Integrator)SI (System Integrator) 3rd Party LCM")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
@@ -11825,121 +11430,178 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="label-restrictions">
+  <xs:element name="contacts">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Label Restriction.")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of contacts")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:label-restriction" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:contact" minOccurs="0" maxOccurs="5000"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="tunnel-termination-point">
+  <xs:element name="profile">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an tunnel termination point",indexedProps="ttp-id,tunnel-tp-id,name,operational-status,model-invariant-id,model-version-id",searchable="ttp-id",uniqueProps="ttp-id",container="tunnel-termination-points",namespace="network",requiredProps="ttp-id",uriTemplate="/network/tunnel-termination-points/tunnel-termination-point/{ttp-id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Profiles store the information (ex, credential-profile) and have a relationship to (ex, pnf)",uniqueProps="profile-name",container="profiles",namespace="common",nameProps="profile-name,profile-type",uriTemplate="/common/profiles/profile/{profile-name}",requiredProps="profile-name")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element name="ttp-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the tunnel termination point")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="tunnel-tp-id" type="xs:string" minOccurs="0">
+        <xs:element name="profile-name" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="TTP ID discovered from controller")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the profile")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="name" type="xs:string" minOccurs="0">
+        <xs:element name="profile-type" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of tunnel termination point")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of profile (ex,network-power-profile)")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="admin-status" type="xs:string" minOccurs="0">
+        <xs:element name="profile-characteristics" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Admin status of TTP e.g, up,down,testing,preparing-maintenance,maintenance.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Set of characteristics of the profile.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="oper-status" type="xs:string" minOccurs="0">
+        <xs:element name="profile-subtype" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operational status of TTP e.g, up,down,testing,preparing-maintenance,maintenance.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Descriptive subtype.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="switching-capability" type="xs:string" minOccurs="0">
+        <xs:element name="profile-selflink" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicate switching capability of TTP e.g,PSC-1, EVPL,L2SC,TDM,OTN.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="encoding" type="xs:string" minOccurs="0">
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Encoding support by the TTP e.g, packet,ethernet,PDH,SDH,digital-wrapper,lambda,fiber,ODUK,line.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="protection-type" type="xs:string" minOccurs="0">
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="profiles">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of profiles")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:profile" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="common">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for common inventory resources.")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:contacts" minOccurs="0"/>
+        <xs:element ref="tns:profiles" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="notification-event-header">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="id" type="xs:string" minOccurs="0"/>
+        <xs:element name="timestamp" type="xs:string" minOccurs="0"/>
+        <xs:element name="source-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="domain" type="xs:string" minOccurs="0"/>
+        <xs:element name="sequence-number" type="xs:string" minOccurs="0"/>
+        <xs:element name="severity" type="xs:string" minOccurs="0"/>
+        <xs:element name="event-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="version" type="xs:string" minOccurs="0"/>
+        <xs:element name="action" type="xs:string" minOccurs="0"/>
+        <xs:element name="entity-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="top-entity-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="entity-link" type="xs:string" minOccurs="0"/>
+        <xs:element name="status" type="xs:string" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="notification-event">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="cambria.partition" type="xs:string" minOccurs="0"/>
+        <xs:element ref="tns:notification-event-header" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="overloaded-model">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models",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" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicate supported protection type of this TTP e.g, unprotected,reroute,reroute-extra,1-for-n,unidir-1-to-1.")</annox:annotate>
+              <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="inter-layer-lock-id" type="xs:int" minOccurs="0">
+        <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(description="correlation between related objects in ETH and OTN topology.")</annox:annotate>
+              <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="selflink" type="xs:string" minOccurs="0">
+        <xs:element name="model-type" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.")</annox:annotate>
+              <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="operational-status" type="xs:string" minOccurs="0">
+        <xs:element name="model-name" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate>
+              <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-customization-id" type="xs:string" minOccurs="0">
+        <xs:element name="model-id" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate>
+              <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-invariant-id" type="xs:string" minOccurs="0">
+        <xs:element name="model-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
+        <xs:element name="model-description" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Description")</annox:annotate>
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
@@ -11950,19 +11612,160 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
+        <xs:element ref="tns:model-vers" minOccurs="0"/>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
-  <xs:element name="tunnel-termination-points">
+  <xs:element name="query-parameters">
      <xs:complexType>
        <xs:annotation>
          <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Tunnel Termination Point.")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="QueryParameters for performing a named-query or model query")</annox:annotate>
          </xs:appinfo>
        </xs:annotation>
        <xs:sequence>
-        <xs:element ref="tns:tunnel-termination-point" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:named-query" minOccurs="0"/>
+        <xs:element ref="tns:overloaded-model" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="instance-filter">
+    <xs:complexType>
+      <xs:sequence/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="instance-filters">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="InstanceFilters for performing a named-query or model query")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:instance-filter" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="secondary-filt">
+    <xs:complexType>
+      <xs:sequence/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="secondary-filts">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SecondaryFilts for performing a named-query or model query")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:secondary-filt" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="model-and-named-query-search">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:query-parameters" minOccurs="0"/>
+        <xs:element ref="tns:instance-filters" minOccurs="0"/>
+        <xs:element ref="tns:secondary-filts" minOccurs="0"/>
+        <xs:element name="top-node-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="secondary-filter-cut-point" type="xs:string" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="properties">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Property holder for query properties or instance properties")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="extra-property">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="extra-properties">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Extra properties for inventory item for response list")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:extra-property" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="inventory-response-item">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Inventory item for response list",container="inventory-response-items")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="model-name" type="xs:string" minOccurs="0"/>
+        <xs:element ref="tns:extra-properties" minOccurs="0"/>
+        <xs:element ref="tns:inventory-response-items" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="inventory-response-items">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Container for inventory items in response list",container="response-list")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:inventory-response-item" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="response-list">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Response container for the results of a named-query or model query")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:inventory-response-items" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="vnf">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true",requiredProps="vnf-id")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="vnf-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
        </xs:sequence>
      </xs:complexType>
    </xs:element>