Sync the latest code changes
[aai/aai-common.git] / aai-core / src / test / resources / bundleconfig-local / etc / oxm / aai_oxm_v12.xml
index 30fe6b6..2364cf8 100644 (file)
                                <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String" />
                        </java-attributes>
                </java-type>
-        
+
                <java-type name="ExternalSystem">
                        <xml-properties>
                                <xml-property name="description" value="Namespace for external system." />
                                <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v12.NetworkProfiles" />
                                <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v12.Pservers" />
                                <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v12.VirtualDataCenters" />
+                               <xml-element java-attribute="operationalEnvironments" name="operational-environments" type="inventory.aai.onap.org.v12.OperationalEnvironments" />
                        </java-attributes>
                </java-type>
 
                        <java-attributes>
                                <xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Identifies the vendor and cloud name, e.g., att-aic. First part of composite key should be formatted as vendor-cloudname" />
+                                               <xml-property name="description" value="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
                                <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v12.VipIpv6AddressList" />
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&amp;T's AIC." />
+                               <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. This could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname" />
                                <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type" />
                                <xml-property name="nameProps" value="owner-defined-type" />
                                <xml-property name="container" value="cloud-regions" />
                                </xml-element>
                                <xml-element java-attribute="relationshipLabel" name="relationship-label" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="The edge lable for this relationship." />
+                                               <xml-property name="description" value="The edge label for this relationship." />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="relatedLink" name="related-link" type="java.lang.String">
                                                <xml-property name="description" value="Name that identifies the physical interface" />
                                        </xml-properties>
                                </xml-element>
+                               <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="URL to endpoint where AAI can get more details." />
+                                       </xml-properties>
+                               </xml-element>
                                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Captures the numeric part of the speed" />
                                                <xml-property name="description" value="Indicates the total bandwidth to be used for this service." />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" required="true" type="java.lang.String">
+                               <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device." />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" required="true" type="java.lang.String">
+                               <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device." />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" required="true" type="java.lang.String">
+                               <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device." />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" required="true" type="java.lang.String">
+                               <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device." />
                                        </xml-properties>
                                <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v12.RouteTableReferences" />
                                <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v12.InstanceGroups" />
                                <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v12.Zones" />
-                <xml-element java-attribute="testObjects" name="test-objects" type="inventory.aai.onap.org.v12.TestObjects" />
                                <xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v12.Configurations" />
+                               <xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v12.ForwardingPaths" />
                        </java-attributes>
                </java-type>
-        <java-type name="TestObjects">
-            <xml-properties>
-                <xml-property name="description" value="Collection of VNFs" />
-            </xml-properties>
-            <xml-root-element name="test-objects" />
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList"
-                             java-attribute="testObject" name="test-object"
-                             type="inventory.aai.onap.org.v12.TestObject" />
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="maximumDepth" value="0" />
-            </xml-properties>
-        </java-type>
-        <java-type name="TestObject">
-            <xml-root-element name="test-object" />
-            <java-attributes>
-                <xml-element java-attribute="vnfId" name="vnf-id"
-                             required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="Unique id of VNF.  This is unique across the graph." />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vnfName" name="vnf-name"
-                             required="true" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Name of VNF." />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vnfName2" name="vnf-name2"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Alternate name of VNF." />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vnfType" name="vnf-type"
-                             required="true" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="serviceId" name="service-id"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="Regional way of organizing pservers, source of truth should define values" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="provStatus" name="prov-status"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="Trigger for operational monitoring of this resource by Service Assurance systems." />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="operationalState" name="operational-state"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path." />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="licenseKey" name="license-key"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="OBSOLETE -  do not use" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="equipmentRole" name="equipment-role"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="Client should send valid enumerated value" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="orchestrationStatus" name="orchestration-status"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="Orchestration status of this VNF, used by MSO." />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="heatStackId" name="heat-stack-id"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="Heat stack id corresponding to this instance, managed by MSO" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="Corresponds to the SDN-C catalog id used to configure this VCE" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="managementOption" name="management-option"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="identifier of managed by ATT or customer" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf." />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="v4 Loopback0 address" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="nmLanV6Address" name="nm-lan-v6-address"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="v6 Loopback address" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="managementV6Address" name="management-v6-address"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="v6 management address" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vcpu" name="vcpu" type="java.lang.Long">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vcpuUnits" name="vcpu-units"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only by uCPE" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vmemory" name="vmemory"
-                             type="java.lang.Long">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vmemoryUnits" name="vmemory-units"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only by uCPE" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vdisk" name="vdisk"
-                             type="java.lang.Long">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only uCPE" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vdiskUnits" name="vdisk-units"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element default-value="false" required="true"
-                             java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
-                    <xml-properties>
-                        <xml-property name="defaultValue" value="false" />
-                        <xml-property name="description"
-                                      value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
-                    </xml-properties>
-                </xml-element>
-                <xml-element default-value="false" required="true"
-                             java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled"
-                             type="java.lang.Boolean">
-                    <xml-properties>
-                        <xml-property name="defaultValue" value="false" />
-                        <xml-property name="description"
-                                      value="used to indicate whether closed loop function is enabled on this node" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="summaryStatus" name="summary-status"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="details regarding the generic-vnf operation, PLEASE DISCONTINUE USE OF THIS FIELD." />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="encryptedAccessFlag" name="encrypted-access-flag"
-                             type="java.lang.Boolean">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="indicates whether generic-vnf access uses SSH" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="entitlementAssignmentGroupUuid"
-                             name="entitlement-assignment-group-uuid" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="UUID of the Entitlement group used for licensing VNFs, OBSOLETE -  See child relationships." />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="entitlementResourceUuid"
-                             name="entitlement-resource-uuid" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="UUID of the specific entitlement resource.  OBSOLETE -  See child relationships." />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="licenseAssignmentGroupUuid"
-                             name="license-assignment-group-uuid" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="UUID of the license assignment group.  OBSOLETE -  See child relationships." />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="licenseKeyUuid" name="license-key-uuid"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="UUID of the actual license resource.  OBSOLETE -  See child relationships." />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="modelInvariantId" name="model-invariant-id"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="the ASDC model id for this resource or service model." />
-                        <xml-property name="visibility" value="deployment" />
-                        <xml-property name="dbAlias" value="model-invariant-id-local" />
-                        <xml-property name="requires" value="model-version-id" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="modelVersionId" name="model-version-id"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="the ASDC model version for this resource or service model." />
-                        <xml-property name="visibility" value="deployment" />
-                        <xml-property name="dbAlias" value="model-version-id-local" />
-                        <xml-property name="requires" value="model-invariant-id" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="personaModelVer" name="persona-model-ver"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="the ASDC model version for this resource or service model." />
-                        <xml-property name="visibility" value="internal" />
-                        <xml-property name="dataCopy"
-                                      value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="notVisibleTestElement"
-                             name="not-visible-test-element" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="visibility" value="internal" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="modelCustomizationId" name="model-customization-id"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="captures the id of all the configuration used to customize the resource for the service." />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="widgetModelId" name="widget-model-id"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="widgetModelVersion" name="widget-model-version"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="asNumber" name="as-number"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="as-number of the VNF" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="regionalResourceSubzone"
-                             name="regional-resource-subzone" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="represents sub zone of the rr plane" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="nfType" name="nf-type"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="Generic description of the type of NF" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="nfFunction" name="nf-function"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="English description of Network function that the specific VNF deployment is providing" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="nfRole" name="nf-role"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="role in the network that this model will be providing" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="nfNamingCode" name="nf-naming-code"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description"
-                                      value="string assigned to this model used for naming purposes" />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="selflink" name="selflink"
-                             type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Path to the controller object." />
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="testObjects" name="test-objects" type="inventory.aai.onap.org.v12.TestObjects" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="General purpose VNF" />
-                <xml-property name="nameProps" value="vnf-name" />
-                <xml-property name="indexedProps"
-                              value="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role" />
-                <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" />
-                <xml-property name="uniqueProps" value="vnf-id" />
-                <xml-property name="container" value="test-objects" />
-                <xml-property name="namespace" value="network" />
-                <xml-property name="extends" value="vnf" />
-            </xml-properties>
-        </java-type>
         <java-type name="Configurations">
                        <xml-properties>
                                <xml-property name="description" value="Collection of configurations" />
                        </xml-properties>
                        <xml-root-element name="configurations" />
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="configuration" name="configurations" type="inventory.aai.onap.org.v12.Configuration" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="configuration" name="configuration" type="inventory.aai.onap.org.v12.Configuration" />
                        </java-attributes>
                </java-type>
 
                <java-type name="Configuration">
                        <xml-root-element name="configuration" />
                        <java-attributes>
-                               <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                               <xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well." />
+                                               <xml-property name="description" value="UUID assigned to configuration." />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true">
+                               <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="UUID assigned to configuration." />
+                                               <xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well." />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="configurationName" name="configuration-name" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="port-mirroring-configuration." />
                                        </xml-properties>
-                               </xml-element>                          
+                               </xml-element>
                                <xml-element java-attribute="configurationSubType" name="configuration-sub-type" required="true" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="vprobe, pprobe." />
                                                <xml-property name="dbAlias" value="model-version-id-local" />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
+                               <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Orchestration status of the configuration." />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="operationalStatus" name="operational-status" required="true" type="java.lang.String">
+                               <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Indicator for whether the resource is considered operational." />
                                        </xml-properties>
-                               </xml-element>                          
-                               <xml-element java-attribute="configurationSelflink" name="configuration-selflink" required="true" type="java.lang.String">
+                               </xml-element>
+                               <xml-element java-attribute="configurationSelflink" name="configuration-selflink" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="URL to endpoint where AAI can get more details from SDN-GC." />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="modelCustomizationId" name="model-customization-id" required="true" type="java.lang.String">
+                               <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="id of  the configuration used to customize the resource" />
                                        </xml-properties>
                                </xml-element>
+                               <xml-element java-attribute="tunnelBandwidth" name="tunnel-bandwidth" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="DHV Site Effective Bandwidth" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vendorAllowedMaxBandwidth" name="vendor-allowed-max-bandwidth" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Velocloud Nominal Throughput - VNT" />
+                                       </xml-properties>
+                               </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                                </xml-element>
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
                                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v12.Metadata" />
+                               <xml-element java-attribute="forwarderEvcs" name="forwarder-evcs" type="inventory.aai.onap.org.v12.ForwarderEvcs" />
+                               <xml-element java-attribute="evcs" name="evcs" type="inventory.aai.onap.org.v12.Evcs" />
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Port Mirror Configuration." />                          
-                               <xml-property name="indexedProps" value="configuration-id,model-invariant-id,model-version-id" />                               
+                               <xml-property name="description" value="Generic configuration object." />
+                               <xml-property name="indexedProps" value="configuration-id,model-invariant-id,model-version-id" />
                                <xml-property name="uniqueProps" value="configuration-id" />
                                <xml-property name="container" value="configurations" />
                                <xml-property name="namespace" value="network" />
-                <xml-property name="nameProps" value="configuration-type" />
                        </xml-properties>
                </java-type>
 
                                </xml-element>
                                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="v4, v6, or ds for dual stack (should be att-ip-version)" />
+                                               <xml-property name="description" value="v4, v6, or ds for dual stack" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
                                                <xml-property name="description" value="name of Physical Network Function." />
                                        </xml-properties>
                                </xml-element>
+                               <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="URL to endpoint where AAI can get more details." />
+                                       </xml-properties>
+                               </xml-element>
                                <xml-element java-attribute="pnfName2Source" name="pnf-name2-source" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="source of name2" />
                        <!-- NOTE that the names of these properties are not consistent and are in mixed case and hyphen case for now -->
                        <xml-properties>
                                <xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules" />
-                               <xml-property name="edgeInfo" value="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV" />
-                       </xml-properties>
+                               <xml-property name="edgeInfo" value="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV" />
+                <xml-property name="uniqueProps" value="aai-uuid" />
+                <xml-property name="indexedProps" value="aai-uuid" />
+            </xml-properties>
                        <xml-root-element name="edge-prop-names" />
                        <java-attributes>
                                <xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String" />
                                <xml-element java-attribute="deleteOtherV" name="delete-other-v" type="java.lang.String" />
                                <xml-element java-attribute="svcinfra" name="SVC-INFRA" type="java.lang.String" />
                                <xml-element java-attribute="preventDelete" name="prevent-delete" type="java.lang.String" />
+                               <xml-element java-attribute="aaiUuid" name="aai-uuid" type="java.lang.String" />
                        </java-attributes>
                </java-type>
 
                        <xml-properties>
                                <xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models" />
                                <xml-property name="nameProps" value="model-name" />
-                               <xml-property name="indexedProps" value="model-version-id,model-name,model-version" />
+                               <xml-property name="indexedProps" value="model-version-id,model-name,model-version,distribution-status" />
                                <xml-property name="uniqueProps" value="model-version-id" />
                                <xml-property name="container" value="model-vers" />
                        </xml-properties>
                                                <xml-property name="description" value="Version" />
                                        </xml-properties>
                                </xml-element>
+                               <xml-element java-attribute="distributionStatus" name="distribution-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Distribution Status" />
+                                       </xml-properties>
+                               </xml-element>
                                <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Description" />
                                                <xml-property name="description" value="Allotted Resource id UUID assigned to this instance." />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" required="true" type="java.lang.String">
+                               <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="The WAN uplink bandwidth for WAN1" />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" required="true" type="java.lang.String">
+                               <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="The WAN downlink bandwidth for WAN1" />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" required="true" type="java.lang.String">
+                               <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="The WAN uplink bandwidth for WAN2" />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" required="true" type="java.lang.String">
+                               <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="The WAN downlink bandwidth for WAN2" />
                                        </xml-properties>
                                <xml-property name="dependentOn" value="cloud-region" />
                        </xml-properties>
                </java-type>
+               
+               <java-type name="OperationalEnvironments">
+                       <xml-properties>
+                               <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC." />
+                       </xml-properties>
+                       <xml-root-element name="operational-environments" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="operationalEnvironment" name="operational-environment" type="inventory.aai.onap.org.v12.OperationalEnvironment" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="OperationalEnvironment">
+                       <xml-root-element name="operational-environment" />
+                       <java-attributes>
+                               <xml-element java-attribute="operationalEnvironmentId" name="operational-environment-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="UUID of an operational environment" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="operationalEnvironmentName" name="operational-environment-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Operational Environment name" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="operationalEnvironmentType" name="operational-environment-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Operational Environment Type." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="operationalEnvironmentStatus" name="operational-environment-status" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Status" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="tenantContext" name="tenant-context" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Tenant Context." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="workloadContext" name="workload-context" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Workload Context." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="It is a logical partition of the cloud which allows to have multiple environments in the production AIC." />
+                               <xml-property name="indexedProps" value="operational-environment-id" />
+                               <xml-property name="nameProps" value="operational-environment-name" />
+                               <xml-property name="uniqueProps" value="operational-environment-id" />
+                               <xml-property name="container" value="operational-environments" />
+                               <xml-property name="namespace" value="cloud-infrastructure" />
+                       </xml-properties>
+               </java-type>
+               
+               <java-type name="ForwardingPaths">
+                       <xml-root-element name="forwarding-paths" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="forwardingPath" name="forwarding-path" type="inventory.aai.onap.org.v12.ForwardingPath" />
+                       </java-attributes>
+               </java-type>
+               
+               <java-type name="ForwardingPath">
+                       <xml-root-element name="forwarding-path"/>
+                       <xml-properties>
+                               <xml-property name="namespace" value="network"/>
+                               <xml-property name="indexedProps" value="forwarding-path-id,forwarding-path-name"/>
+                               <xml-property name="description" value="Entity that describes the sequenced forwarding path between interfaces of services or resources"/>
+                         <xml-property name="container" value="forwarding-paths" />
+                         <xml-property name="nameProps" value="forwarding-path-name" />
+                         <xml-property name="uniqueProps" value="forwarding-path-id" />
+                       </xml-properties>
+                       <java-attributes>
+                               <xml-element java-attribute="forwardingPathId" name="forwarding-path-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of this FP"/>
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="forwardingPathName" name="forwarding-path-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name of the FP"/>
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the self link for this FP"/>
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="forwarders" name="forwarders" type="inventory.aai.onap.org.v12.Forwarders" />
+                       </java-attributes>
+               </java-type>
+               
+               <java-type name="Forwarders">
+                       <xml-root-element name="forwarders" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="forwarder" name="forwarder" type="inventory.aai.onap.org.v12.Forwarder" />
+                       </java-attributes>
+               </java-type>
+               
+               <java-type name="Forwarder">
+                       <xml-root-element name="forwarder"/>
+                       <xml-properties>
+                               <xml-property name="indexedProps" value="sequence"/>
+                               <xml-property name="description" value="Entity describing a sequenced segment of forwarding path"/>
+                               <xml-property name="container" value="forwarders" />
+                               <xml-property name="dependentOn" value="forwarding-path" />
+                       </xml-properties>
+                       <java-attributes>
+                               <xml-element java-attribute="sequence" name="sequence" required="true" type="java.lang.Integer" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of this segmentation"/>
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="forwarderRole" name="forwarder-role" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ingress, intermediate, egress"/>
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                                       </xml-properties>
+                               </xml-element>
+                       </java-attributes>
+               </java-type>
+               
+               <java-type name="ForwarderEvcs">
+                       <xml-root-element name="forwarder-evcs"/>
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="forwarderEvc" name="forwarder-evc" type="inventory.aai.onap.org.v12.ForwarderEvc"/>
+                       </java-attributes>
+               </java-type>
+               
+               <java-type name="ForwarderEvc">
+                       <xml-root-element name="forwarder-evc"/>
+                       <java-attributes>
+                               <xml-element java-attribute="forwarderEvcId" name="forwarder-evc-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Key for forwarder-evc object"/>
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Circuit ID from customer/ESP/ingress end of EVC, or reference to beater circuit on gateway/network/egress end of EVC" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ivlan" name="ivlan" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Internal VLAN." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="svlan" name="svlan" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="SVLAN value for ingress of egress forwarder." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="CVLAN value for ingress of egress forwarder." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                                       </xml-properties>
+                               </xml-element>
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="forwarder object is an optional child object of the Configuration object." />
+                               <xml-property name="dependentOn" value="configuration" />
+                               <xml-property name="uniqueProps" value="forwarder-evc-id" />
+                               <xml-property name="container" value="forwarder-evcs" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Evcs">
+                       <xml-root-element name="evcs" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="evc" name="evc" type="inventory.aai.onap.org.v12.Evc" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Evc">
+                       <xml-root-element name="evc" />
+                       <java-attributes>
+                               <xml-element java-attribute="evcId" name="evc-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique/key field for the evc object" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="forwardingPathTopology" name="forwarding-path-topology" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Point-to-Point, Multi-Point" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="cirValue" name="cir-value" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Commited Information Rate" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="cirUnits" name="cir-units" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="CIR units" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="connectionDiversityGroupId" name="connection-diversity-group-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Diversity Group ID" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceHours" name="service-hours" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="formerly Performance Group" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="espEvcCircuitId" name="esp-evc-circuit-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="EVC Circuit ID of ESP EVC" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="espEvcCirValue" name="esp-evc-cir-value" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Committed Information Rate (For ESP)" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="espEvcCirUnits" name="esp-evc-cir-units" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="CIR units (For ESP)" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="espItuCode" name="esp-itu-code" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Identifies ESP" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="collectorPopClli" name="collector-pop-clli" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Collector POP CLLI (from the hostname of the access pnf)" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="interConnectTypeIngress" name="inter-connect-type-ingress" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Interconnect type on ingress side of EVC." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="tagmodeAccessIngress" name="tagmode-access-ingress" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="tagode for collector side of EVC" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="tagmodeAccessEgress" name="tagmode-access-egress" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="tagMode for network side of EVC" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                                       </xml-properties>
+                               </xml-element>
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="evc object is an optional child object of the Configuration object." />
+                               <xml-property name="dependentOn" value="configuration" />
+                               <xml-property name="uniqueProps" value="evc-id" />
+                               <xml-property name="container" value="evcs" />
+                       </xml-properties>
+               </java-type>
+
        </java-types>
 </xml-bindings>