Add auth-info node to cloud-region.
[aai/aai-common.git] / aai-schema / src / main / resources / oxm / aai_oxm_v11.xml
index c739121..d65445c 100644 (file)
                                                <xml-property name="description" value="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." />
                                        </xml-properties>
                                </xml-element>
+                               <xml-element default-value="false" required="true" java-attribute="sriovAutomation" name="sriov-automation" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="Whether the cloud region supports (true) or does not support (false) SR-IOV automation." />
+                                       </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>          
                                <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v11.VolumeGroups" />
                                <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v11.Tenants" />
                                <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v11.Flavors" />
                                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v11.OamNetworks" />
                                <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v11.AvailabilityZones" />
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element java-attribute="authInfoItems" name="auth-info-items" type="inventory.aai.onap.org.v11.AuthInfoItems" />
                        </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="container" value="volume-groups" />
                        </xml-properties>
                </java-type>
+               
+               <java-type name="AuthInfoItems">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of persistent auth information to access to VIM." />
+                       </xml-properties>
+                       <xml-root-element name="auth-info-items" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="authInfoItem" name="auth-info-item" type="inventory.aai.onap.org.v11.AuthInfoItem" />
+                       </java-attributes>
+               </java-type>
+               
+               <java-type name="AuthInfoItem">
+                       <xml-root-element name="auth-info-item" />
+                       <java-attributes>
+                       <xml-element java-attribute="authInfoItemId" name="auth-info-item-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of auth-info-item." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="cloudDomain" name="cloud-domain" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="domain info for authentication." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="userName" name="username" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="user name of auth infomation to access VIM." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="password" name="password" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="password of auth infomation to access VIM." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="authUrl" name="auth-url" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="authentication url of the cloud." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="sslCacert" name="ssl-cacert" required="false" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ca file content if enabled ssl on auth-url." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" java-attribute="sslInsecure" name="ssl-insecure" required="false" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Whether to verify VIM's certificate." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Persistent auth info." />
+                               <xml-property name="indexedProps" value="auth-info-item-id,username,auth-url" />
+                               <xml-property name="searchable" value="auth-info-item-id,username,auth-url" />
+                               <xml-property name="dependentOn" value="cloud-region" />
+                               <xml-property name="container" value="auth-info-items" />
+                       </xml-properties>
+               </java-type>
+               
 
                <java-type name="RelationshipList">
                        <xml-root-element name="relationship-list" />
                                                <xml-property name="description" value="Readable name of tenant" />
                                        </xml-properties>
                                </xml-element>
+                               <xml-element java-attribute="tenantContext" name="tenant-context" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This field will store the tenant 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-property name="description" value="Openstack tenant" />
                                <xml-property name="nameProps" value="tenant-name" />
-                               <xml-property name="indexedProps" value="tenant-name,tenant-id" />
+                               <xml-property name="indexedProps" value="tenant-name,tenant-id,tenant-context" />
                                <xml-property name="searchable" value="tenant-id,tenant-name" />
                                <xml-property name="dependentOn" value="cloud-region" />
                                <xml-property name="container" value="tenants" />
                                        <xml-properties>
                                                <xml-property name="description" value="Prov Status of the logical interface. Valid values [PREPROV/NVTPROV/PROV]." />
                                        </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration." />
+                                       </xml-properties>
                                </xml-element>                          
                                <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v11.Vlans" />
                                <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v11.SriovVfs" />
                        <xml-properties>
                                <xml-property name="description" value="Logical interfaces, e.g., a vnic." />
                                <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name" />
-                               <xml-property name="dependentOn" value="generic-vnf,newvce,vpe,p-interface,vserver,lag-interface" />
+                               <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface" />
                                <xml-property name="container" value="l-interfaces" />
                        </xml-properties>
                </java-type>
                                        <xml-properties>
                                                <xml-property name="description" value="Prov Status of the VLAN configuration related to a logical interface. Valid values [PREPROV/NVTPROV/PROV]." />
                                        </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration." />
+                                       </xml-properties>
                                </xml-element>                  
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
                                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv4AddressList" />
 
                <java-type name="DvsSwitches">
                        <xml-properties>
-                               <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and VPEs." />
+                               <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs." />
                        </xml-properties>
                        <xml-root-element name="dvs-switches" />
                        <java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="Link aggregate interface" />
                                <xml-property name="indexedProps" value="interface-name,interface-id,interface-role" />
-                               <xml-property name="dependentOn" value="generic-vnf,pserver,vpe,vpls-pe,pnf" />
+                               <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf" />
                                <xml-property name="container" value="lag-interfaces" />
                        </xml-properties>
                </java-type>
                                                <xml-property name="description" value="This field will store a name assigned to the service-instance." />
                                        </xml-properties>
                                </xml-element>
+                               <xml-element java-attribute="serviceType" name="service-type" required="false" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="String capturing type of service." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceRole" name="service-role" required="false" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="String capturing the service role." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="environmentContext" name="environment-context" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This field will store the environment context assigned to the service-instance." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="workloadContext" name="workload-context" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This field will store the workload context assigned to the service-instance." />
+                                       </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." />
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="Instance of a service" />
-                               <xml-property name="indexedProps" value="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status" />
+                               <xml-property name="indexedProps" value="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" />
                                <xml-property name="nameProps" value="service-instance-name" />
                                <xml-property name="searchable" value="service-instance-id,service-instance-name" />
                                <xml-property name="uniqueProps" value="service-instance-id" />
                <java-type name="VnfImage">
                        <xml-root-element name="vnf-image" />
                        <java-attributes>
-                               <xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true">
+                               <xml-element java-attribute="vnfImageUuid" name="vnf-image-uuid" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
                                                <xml-property name="description" value="Unique ID of this asset" />
                                        </xml-properties>
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
-                               <xml-property name="indexedProps" value="application,att-uuid,application-vendor,application-version" />
-                               <xml-property name="uniqueProps" value="att-uuid" />
+                               <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version" />
+                               <xml-property name="uniqueProps" value="vnf-image-uuid" />
                                <xml-property name="container" value="vnf-images" />
                                <xml-property name="namespace" value="service-design-and-creation" />
                        </xml-properties>
                                <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v11.VplsPes" />
                                <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v11.MulticastConfigurations" />
                                <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v11.Vces" />
-                               <xml-element java-attribute="vpes" name="vpes" type="inventory.aai.onap.org.v11.Vpes" />
                                <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v11.Vnfcs" />
                                <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v11.L3Networks" />
                                <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v11.NetworkPolicies" />
                                                <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ" />
                                        </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 java-attribute="linkType" name="link-type" required="true" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Type of logical link, e.g., evc" />
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="indexedProps" value="routing-instance-id" />
-                               <xml-property name="uniqueProps" value="routing-instance-id" />
                                <xml-property name="dependentOn" value="site-pair-set" />
                                <xml-property name="container" value="routing-instances" />
                        </xml-properties>
                                                <xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values" />
                                        </xml-properties>
                                </xml-element>
+                               <xml-element java-attribute="vpnRegion" name="vpn-region" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="region of customer vpn" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="customerVpnId" name="customer-vpn-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="id for this customer vpn" />
+                                       </xml-properties>
+                               </xml-element>
                                <xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network." />
                                </xml-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 vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address)." />
+                                               <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
                        </xml-properties>
                </java-type>
 
-               <java-type name="Vpes">
-                       <xml-properties>
-                               <xml-property name="description" value="Virtual provider edge router. In 1504, A&amp;AI will populate this object through an M&amp;P and tool provided to operations." />
-                       </xml-properties>
-                       <xml-root-element name="vpes" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="vpe" name="vpe" type="inventory.aai.onap.org.v11.Vpe" />
-                       </java-attributes>
-               </java-type>
 
-               <java-type name="Vpe">
-                       <xml-root-element name="vpe" />
-                       <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 map strictly to ASDC services.  SOON TO BE DEPRECATED" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" />
-                                       </xml-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="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="licenseKey" name="license-key" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="OBSOLETE -  do not use.  See child relationships." />
-                                       </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, mastered by MSO" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
-                                       </xml-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="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address)." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Prefix length for oam-address" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Gateway address" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="v4Loopback0IpAddress" name="v4-loopback0-ip-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Loopback0 address" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Temporary location for stag to get to VCE" />
-                                       </xml-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 VPE" />
-                                       </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 vpe 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 vpe access uses SSH" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" />
-                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" />
-                               <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v11.Licenses" />
-                               <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v11.Entitlements" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Relationship-list must include related to info for complex." />
-                               <xml-property name="nameProps" value="vnf-name" />
-                               <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,prov-status,service-id" />
-                               <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" />
-                               <xml-property name="uniqueProps" value="vnf-id" />
-                               <xml-property name="container" value="vpes" />
-                               <xml-property name="namespace" value="network" />
-                               <xml-property name="extends" value="vnf" />
-                       </xml-properties>
-               </java-type>
 
                <java-type name="Vnfcs">
                        <xml-properties>
                                                <xml-property name="description" value="Unique ID of vnfc." />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="vnfcFunctionCode" name="vnfc-function-code" required="true" type="java.lang.String">
+                               <xml-element java-attribute="nfcNamingCode" name="nfc-naming-code" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="function code" />
+                                               <xml-property name="description" value="Short code that is used in naming instances of the item being modeled" />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="vnfcType" name="vnfc-type" required="true" type="java.lang.String">
+                               <xml-element java-attribute="nfcFunction" name="nfc-function" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="type" />
+                                               <xml-property name="description" value="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                                                <xml-property name="description" value="Group notation of VNFC" />
                                        </xml-properties>
                                </xml-element>
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-version-id" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-invariant-id" />
+                                       </xml-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 java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" />
+                               <xml-property name="indexedProps" value="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id" />
                                <xml-property name="searchable" value="vnfc-name" />
                                <xml-property name="container" value="vnfcs" />
                                <xml-property name="namespace" value="network" />
                                                <xml-property name="description" value="the last address reserved for use by dhcp" />
                                        </xml-properties>
                                </xml-element>
+                                       <xml-element java-attribute="subnetRole" name="subnet-role" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="role of the subnet, referenced when assigning IPs" />
+                                       </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 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-property name="suggestibleOnSearch" value="true"/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="nfFunction" name="nf-function" type="java.lang.String">
                                <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-property name="suggestibleOnSearch" value="true"/>
                                        </xml-properties>
                                </xml-element>  
                                <xml-element java-attribute="nfNamingCode" name="nf-naming-code" type="java.lang.String">
                                </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 vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address)." />
+                                               <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Client should send valid enumerated value, e.g., VPE." />
+                                               <xml-property name="description" value="Client should send valid enumerated value." />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                </xml-element>
                                <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
+                                               <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
                                </xml-element>
                                <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
+                                               <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
                                <xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String" />
                                <xml-element java-attribute="direction" name="direction" type="java.lang.String" />
                                <xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String" />
-                               <xml-element java-attribute="isParent" name="isParent" type="java.lang.Boolean" />
-                               <xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean" />
-                               <xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean" />
-                               <xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.Boolean" />
-                               <xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" type="java.lang.Boolean" />
+                               <xml-element java-attribute="containsOtherV" name="contains-other-v" type="java.lang.String" />
+                               <xml-element java-attribute="deleteOtherV" name="delete-other-v" type="java.lang.String" />
+                               <xml-element java-attribute="svcinfra" name="SVC-INFRA" type="java.lang.String" />
+                               <xml-element java-attribute="preventDelete" name="prevent-delete" type="java.lang.String" />
                        </java-attributes>
                </java-type>
 
                <java-type name="InstanceGroup">
                        <xml-root-element name="instance-group" />
                        <java-attributes>
+                               <xml-element java-attribute="instanceGroupRole" name="instance-group-role" required="false" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="role of the instance group." />
+                                       </xml-properties>
+                               </xml-element>
+
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="false" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ASDC model id for this resource or service model." />
+                                       </xml-properties>
+                               </xml-element>
+
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" required="false" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ASDC model version uid for this resource model." />
+                                       </xml-properties>
+                               </xml-element>
                                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
                                                <xml-property name="description" value="Instance Group ID, UUID assigned to this instance." />
                        <xml-properties>
                                <xml-property name="description" value="Metadata for entitlement group." />
                                <xml-property name="indexedProps" value="group-uuid,resource-uuid" />
-                               <xml-property name="dependentOn" value="generic-vnf,vce,vpe" />
+                               <xml-property name="dependentOn" value="generic-vnf,vce" />
                                <xml-property name="container" value="entitlements" />
                        </xml-properties>
                </java-type>
                        <xml-properties>
                                <xml-property name="description" value="Metadata for license group." />
                                <xml-property name="indexedProps" value="group-uuid,resource-uuid" />
-                               <xml-property name="dependentOn" value="generic-vnf,vce,vpe" />
+                               <xml-property name="dependentOn" value="generic-vnf,vce" />
                                <xml-property name="container" value="licenses" />
                        </xml-properties>
                </java-type>
                                <xml-property name="description" value="Abstract vnf class" />
                                <xml-property name="indexedProps" value="vnf-id" />
                                <xml-property name="uniqueProps" value="vnf-id" />
-                               <xml-property name="inheritors" value="vce,vpe,generic-vnf" />
+                               <xml-property name="inheritors" value="vce,generic-vnf" />
                                <xml-property name="abstract" value="true" />
                        </xml-properties>
                </java-type>
                                </xml-element>
                                <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Design of zone [Medium/Large]" />
+                                               <xml-property name="description" value="Design of zone [Medium/Large?]" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">