diff options
Diffstat (limited to 'aai-resources/src/test')
7 files changed, 64 insertions, 1047 deletions
diff --git a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml index a97c53c..765674d 100644 --- a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml +++ b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml @@ -750,7 +750,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> @@ -1215,7 +1215,7 @@ <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.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack snapshot" /> @@ -1382,7 +1382,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> @@ -1753,7 +1753,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> @@ -2355,7 +2355,6 @@ <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.openecomp.org.v10.VplsPes" /> <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.openecomp.org.v10.MulticastConfigurations" /> <xml-element java-attribute="vces" name="vces" type="inventory.aai.openecomp.org.v10.Vces" /> - <xml-element java-attribute="vpes" name="vpes" type="inventory.aai.openecomp.org.v10.Vpes" /> <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.openecomp.org.v10.Vnfcs" /> <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.openecomp.org.v10.L3Networks" /> <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.openecomp.org.v10.NetworkPolicies" /> @@ -2760,7 +2759,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 GenericVnf (v4-loopback0-ip-address)." /> </xml-properties> </xml-element> <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> @@ -3064,146 +3063,7 @@ </xml-properties> </java-type> - <java-type name="Vpes"> - <xml-properties> - <xml-property name="description" value="Virtual provider edge router. In 1504, A&AI will populate this object through an M&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.v10.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-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.v10.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.LagInterfaces" /> - <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v10.Licenses" /> - <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v10.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> @@ -4063,12 +3923,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 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"> @@ -5413,7 +5273,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> @@ -5452,7 +5312,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> @@ -5470,7 +5330,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> diff --git a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml index 9a2ebc3..6177cdb 100644 --- a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml +++ b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml @@ -751,7 +751,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> @@ -1383,7 +1383,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> @@ -1754,7 +1754,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> @@ -2398,7 +2398,6 @@ <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.att.com.v11.VplsPes" /> <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.att.com.v11.MulticastConfigurations" /> <xml-element java-attribute="vces" name="vces" type="inventory.aai.att.com.v11.Vces" /> - <xml-element java-attribute="vpes" name="vpes" type="inventory.aai.att.com.v11.Vpes" /> <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.att.com.v11.Vnfcs" /> <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.att.com.v11.L3Networks" /> <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.att.com.v11.NetworkPolicies" /> @@ -2803,7 +2802,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 GenericVnf (v4-loopback0-ip-address)." /> </xml-properties> </xml-element> <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> @@ -3107,147 +3106,6 @@ </xml-properties> </java-type> - <java-type name="Vpes"> - <xml-properties> - <xml-property name="description" value="Virtual provider edge router. In 1504, A&AI will populate this object through an M&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.att.com.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="operationalState" name="operational-state" 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.att.com.v11.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.att.com.v11.LInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.att.com.v11.LagInterfaces" /> - <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.att.com.v11.Licenses" /> - <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.att.com.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="virtual network components associated with a vserver from application controller." /> @@ -4106,12 +3964,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 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"> @@ -5456,7 +5314,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> @@ -5495,7 +5353,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> @@ -5513,7 +5371,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> diff --git a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml index 7e4e538..ae4f8da 100644 --- a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml +++ b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml @@ -707,7 +707,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> @@ -1161,7 +1161,7 @@ <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.openecomp.org.v8.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack snapshot" /> @@ -1328,7 +1328,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> @@ -1623,7 +1623,7 @@ <xml-properties> <xml-property name="description" value="Link aggregate interface" /> <xml-property name="indexedProps" value="interface-name" /> - <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> @@ -2210,7 +2210,6 @@ <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.openecomp.org.v8.VplsPes" /> <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.openecomp.org.v8.MulticastConfigurations" /> <xml-element java-attribute="vces" name="vces" type="inventory.aai.openecomp.org.v8.Vces" /> - <xml-element java-attribute="vpes" name="vpes" type="inventory.aai.openecomp.org.v8.Vpes" /> <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.openecomp.org.v8.Vnfcs" /> <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.openecomp.org.v8.L3Networks" /> <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.openecomp.org.v8.NetworkPolicies" /> @@ -2581,7 +2580,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 GenericVnf (v4-loopback0-ip-address)." /> </xml-properties> </xml-element> <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> @@ -2883,144 +2882,7 @@ </xml-properties> </java-type> - <java-type name="Vpes"> - <xml-properties> - <xml-property name="description" value="Virtual provider edge router. In 1504, A&AI will populate this object through an M&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.v8.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 and clients should expect changes to occur in the future to this field as ASDC 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 from ASDC" /> - </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-properties> - </xml-element> - <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="License key" /> - </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" /> - </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.v8.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v8.LInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v8.LagInterfaces" /> - </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> @@ -3811,12 +3673,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 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"> @@ -4789,7 +4651,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> diff --git a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml index 297a3f9..aeeab4c 100644 --- a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml +++ b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml @@ -739,7 +739,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> @@ -1198,7 +1198,7 @@ <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.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack snapshot" /> @@ -1365,7 +1365,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> @@ -1724,7 +1724,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> @@ -2326,7 +2326,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" /> @@ -2731,7 +2730,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 GenericVnf (v4-loopback0-ip-address)." /> </xml-properties> </xml-element> <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> @@ -3035,146 +3034,7 @@ </xml-properties> </java-type> - <java-type name="Vpes"> - <xml-properties> - <xml-property name="description" value="Virtual provider edge router. In 1504, A&AI will populate this object through an M&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-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> @@ -4012,12 +3872,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 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"> @@ -5348,7 +5208,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> @@ -5387,7 +5247,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> @@ -5405,7 +5265,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> diff --git a/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml b/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml index d807bc3..e5a8c6d 100644 --- a/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml +++ b/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml @@ -748,7 +748,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> @@ -1380,7 +1380,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> @@ -1752,7 +1752,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> @@ -2354,7 +2354,6 @@ <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.openecomp.org.v10.VplsPes" /> <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.openecomp.org.v10.MulticastConfigurations" /> <xml-element java-attribute="vces" name="vces" type="inventory.aai.openecomp.org.v10.Vces" /> - <xml-element java-attribute="vpes" name="vpes" type="inventory.aai.openecomp.org.v10.Vpes" /> <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.openecomp.org.v10.Vnfcs" /> <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.openecomp.org.v10.L3Networks" /> <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.openecomp.org.v10.NetworkPolicies" /> @@ -2797,7 +2796,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 GenericVnf (v4-loopback0-ip-address)." /> </xml-properties> </xml-element> <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> @@ -3101,146 +3100,7 @@ </xml-properties> </java-type> - <java-type name="Vpes"> - <xml-properties> - <xml-property name="description" value="Virtual provider edge router. In 1504, A&AI will populate this object through an M&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.v10.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-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.v10.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.LagInterfaces" /> - <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v10.Licenses" /> - <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v10.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> @@ -4100,12 +3960,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 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"> @@ -5450,7 +5310,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> @@ -5489,7 +5349,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> @@ -5507,7 +5367,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> diff --git a/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v11.xml b/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v11.xml index f8fa53d..7aa4114 100644 --- a/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v11.xml +++ b/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v11.xml @@ -751,7 +751,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> @@ -1383,7 +1383,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> @@ -1755,7 +1755,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> @@ -2399,7 +2399,6 @@ <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.att.com.v11.VplsPes" /> <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.att.com.v11.MulticastConfigurations" /> <xml-element java-attribute="vces" name="vces" type="inventory.aai.att.com.v11.Vces" /> - <xml-element java-attribute="vpes" name="vpes" type="inventory.aai.att.com.v11.Vpes" /> <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.att.com.v11.Vnfcs" /> <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.att.com.v11.L3Networks" /> <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.att.com.v11.NetworkPolicies" /> @@ -2842,7 +2841,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 GenericVnf (v4-loopback0-ip-address)." /> </xml-properties> </xml-element> <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> @@ -3146,147 +3145,6 @@ </xml-properties> </java-type> - <java-type name="Vpes"> - <xml-properties> - <xml-property name="description" value="Virtual provider edge router. In 1504, A&AI will populate this object through an M&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.att.com.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="operationalState" name="operational-state" 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.att.com.v11.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.att.com.v11.LInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.att.com.v11.LagInterfaces" /> - <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.att.com.v11.Licenses" /> - <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.att.com.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="virtual network components associated with a vserver from application controller." /> @@ -4145,12 +4003,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 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"> @@ -5495,7 +5353,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> @@ -5534,7 +5392,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> @@ -5552,7 +5410,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> diff --git a/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v9.xml b/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v9.xml index 158eef8..d30636e 100644 --- a/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v9.xml +++ b/aai-resources/src/test/resources/org/openecomp/aai/introspection/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> @@ -2321,7 +2321,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" /> @@ -2730,7 +2729,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 GenericVnf (v4-loopback0-ip-address)." /> </xml-properties> </xml-element> <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> @@ -3035,147 +3034,7 @@ </xml-properties> </java-type> - <java-type name="Vpes"> - <xml-properties> - <xml-property name="description" value="Virtual provider edge router. In 1504, A&AI will populate this object through an M&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> @@ -4015,12 +3874,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 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"> @@ -5351,7 +5210,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> @@ -5390,7 +5249,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> @@ -5408,7 +5267,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> |