X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=aai-schema%2Fsrc%2Fmain%2Fresources%2Foxm%2Faai_oxm_v9.xml;h=0f061666aa90a47a77c5f93dfea20880fd3d0236;hb=a84e52f06e453e9fb405c3dcb0e3e4d5e6ffbd1a;hp=8366cf1001ed75a575c26e2c69fa41f4e8b33b6d;hpb=df8e8f551fd6df1b983f009ca988ab1518176e29;p=aai%2Faai-common.git

diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v9.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v9.xml
index 8366cf10..0f061666 100644
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v9.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v9.xml
@@ -737,7 +737,7 @@
             <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>
@@ -1364,7 +1364,7 @@
 
         <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>
@@ -1723,7 +1723,7 @@
             <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>
@@ -2325,7 +2325,6 @@
                 <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.openecomp.org.v9.VplsPes" />
                 <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.openecomp.org.v9.MulticastConfigurations" />
                 <xml-element java-attribute="vces" name="vces" type="inventory.aai.openecomp.org.v9.Vces" />
-                <xml-element java-attribute="vpes" name="vpes" type="inventory.aai.openecomp.org.v9.Vpes" />
                 <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.openecomp.org.v9.Vnfcs" />
                 <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.openecomp.org.v9.L3Networks" />
                 <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.openecomp.org.v9.NetworkPolicies" />
@@ -2735,7 +2734,7 @@
                 </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 VPE (v4-loopback0-ip-address)." />
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
@@ -3040,147 +3039,7 @@
             </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.openecomp.org.v9.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="operationalState" name="operational-state" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Indicator for whether the resource is considered operational" />
-                        <xml-property name="dbAlias" value="operational-status" />
-                    </xml-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.openecomp.org.v9.RelationshipList" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.LInterfaces" />
-                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.LagInterfaces" />
-                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v9.Licenses" />
-                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v9.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>
@@ -4007,12 +3866,12 @@
                 </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 VPE (v4-loopback0-ip-address)." />
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Client should send valid enumerated value, e.g., 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">
@@ -5345,7 +5204,7 @@
             <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>
@@ -5384,7 +5243,7 @@
             <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>
@@ -5402,7 +5261,7 @@
                 <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>