diff options
| author |   Lin, Jerry (jl319x) <jl319x@att.com> | 2017-08-14 16:33:47 -0400 |
|---|---|---|
| committer | Lin, Jerry (jl319x) <jl319x@att.com> | 2017-08-14 16:37:30 -0400 |
| commit | a84e52f06e453e9fb405c3dcb0e3e4d5e6ffbd1a (patch) | |
| tree | e148657f5290bf7dc50f7e153b8c68da47648b6f /aai-core/src | |
| parent | df8e8f551fd6df1b983f009ca988ab1518176e29 (diff) | |
[AAI-149 Amsterdam] migrate vpe
Change-Id: I6189a8175425f4b7301659fce96f4c359dc6473a
Signed-off-by: Lin, Jerry (jl319x) <jl319x@att.com>
Diffstat (limited to 'aai-core/src')
6 files changed, 105 insertions, 690 deletions
diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/utils/QueryParamInjector.java b/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/utils/QueryParamInjector.java index c67ed788..725152dd 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/utils/QueryParamInjector.java +++ b/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/utils/QueryParamInjector.java @@ -5,16 +5,16 @@ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * ============LICENSE_END========================================================= */ diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml index af05d3d9..ba6bb24a 100644 --- a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml +++ b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml @@ -917,7 +917,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> @@ -1622,7 +1622,7 @@ </java-type> <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> @@ -2130,7 +2130,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> @@ -2764,7 +2764,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" /> @@ -3192,7 +3191,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-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> @@ -3527,167 +3526,6 @@ <xml-property name="container" value="cvlan-tags" /> </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-property name="sourceOfTruthType" value="aai" /> - </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-property name="sourceOfTruthType" value="aai" /> - </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-property name="sourceOfTruthType" value="aai" /> - </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-property name="sourceOfTruthType" value="aai" /> - </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-property name="sourceOfTruthType" value="aai" /> - </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-property name="sourceOfTruthType" value="aai" /> - </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-property name="sourceOfTruthType" value="aai" /> - </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="sourceOfTruthType" value="aai" /> - </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-property name="sourceOfTruthType" value="aai" /> - </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-property name="sourceOfTruthType" value="aai" /> - </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-property name="sourceOfTruthType" value="aai" /> - </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-property name="sourceOfTruthType" value="aai" /> - </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-property name="sourceOfTruthType" value="aai" /> - </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-property name="sourceOfTruthType" value="aai" /> - </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-property name="sourceOfTruthType" value="aai" /> - </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-property name="sourceOfTruthType" value="aai" /> - </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-property name="sourceOfTruthType" value="aai" /> - </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-property name="sourceOfTruthType" value="aai" /> - </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-property name="sourceOfTruthType" value="aai" /> - </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-property name="sourceOfTruthType" value="aai" /> - </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-property name="sourceOfTruthType" value="aai" /> - </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-property name="sourceOfTruthType" value="aai" /> - </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> <xml-property name="description" value="virtual network components associated with a vserver from application controller." /> @@ -4659,13 +4497,13 @@ </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-property name="sourceOfTruthType" value="aai" /> </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-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> @@ -6318,7 +6156,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> @@ -6357,7 +6195,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> @@ -6375,7 +6213,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-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml index f5e47a4b..5bff420e 100644 --- a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml +++ b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml @@ -718,12 +718,12 @@ <xml-properties> <xml-property name="description" value="Whether A&AI should be managing this interface of not. Could have value like CUSTOMER" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Human friendly text regarding this interface." /> </xml-properties> - </xml-element> + </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." /> @@ -738,7 +738,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> @@ -936,7 +936,7 @@ <xml-properties> <xml-property name="description" value="Whether customer is going to use this VLAN for backdoor connection to another customer premise device." /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="vpnId" name="vpn-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan" /> @@ -1128,7 +1128,7 @@ <xml-property name="container" value="flavors" /> </xml-properties> </java-type> - + <java-type name="Snapshots"> <xml-properties> <xml-property name="description" value="Collection of openstack snapshots" /> @@ -1136,9 +1136,9 @@ <xml-root-element name="snapshots" /> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v11.Snapshot" /> - </java-attributes> + </java-attributes> </java-type> - + <java-type name="Snapshot"> <xml-root-element name="snapshot" /> <java-attributes> @@ -1206,9 +1206,9 @@ <xml-property name="indexedProps" value="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id" /> <xml-property name="dependentOn" value="cloud-region" /> <xml-property name="container" value="snapshots" /> - </xml-properties> + </xml-properties> </java-type> - + <java-type name="GroupAssignments"> <xml-properties> <xml-property name="description" value="Collection of openstack group assignments" /> @@ -1218,7 +1218,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v11.GroupAssignment" /> </java-attributes> </java-type> - + <java-type name="GroupAssignment"> <xml-root-element name="group-assignment" /> <java-attributes> @@ -1231,7 +1231,7 @@ <xml-properties> <xml-property name="description" value="Group type - the type of group this instance refers to" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="groupName" name="group-name" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Group name - name assigned to the group" /> @@ -1241,12 +1241,12 @@ <xml-properties> <xml-property name="description" value="Group description - description of the group" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> @@ -1256,7 +1256,7 @@ <xml-property name="dependentOn" value="cloud-region" /> <xml-property name="container" value="group-assignments" /> </xml-properties> - </java-type> + </java-type> <java-type name="Images"> <xml-properties> @@ -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> @@ -1686,7 +1686,7 @@ <xml-properties> <xml-property name="description" value="Human friendly text regarding this interface." /> </xml-properties> - </xml-element> + </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." /> @@ -1722,8 +1722,8 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Link aggregate interface" /> - <xml-property name="indexedProps" value="interface-name,interface-id,interface-role" /> - <xml-property name="dependentOn" value="generic-vnf,pserver,vpe,vpls-pe,pnf" /> + <xml-property name="indexedProps" value="interface-name" /> + <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe" /> <xml-property name="container" value="lag-interfaces" /> </xml-properties> </java-type> @@ -2345,7 +2345,6 @@ <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v11.VplsPes" /> <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v11.MulticastConfigurations" /> <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v11.Vces" /> - <xml-element java-attribute="vpes" name="vpes" type="inventory.aai.onap.org.v11.Vpes" /> <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v11.Vnfcs" /> <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v11.L3Networks" /> <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v11.NetworkPolicies" /> @@ -2355,9 +2354,6 @@ <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v11.Pnfs" /> <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v11.PhysicalLinks" /> <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v11.IpsecConfigurations" /> - <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v11.RouteTableReferences" /> - <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v11.InstanceGroups" /> - <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v11.Zones" /> </java-attributes> </java-type> @@ -2592,7 +2588,7 @@ <xml-properties> <xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc." /> </xml-properties> - </xml-element> + </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." /> @@ -2739,7 +2735,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"> @@ -3043,146 +3039,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.onap.org.v11.Vpe" /> - </java-attributes> - </java-type> - <java-type name="Vpe"> - <xml-root-element name="vpe" /> - <java-attributes> - <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique id of VNF. This is unique across the graph." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of VNF." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Alternate name of VNF." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Unique identifier of service. Does not map strictly to ASDC services. SOON TO BE DEPRECATED" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="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.onap.org.v11.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" /> - <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v11.Licenses" /> - <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v11.Entitlements" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Relationship-list must include related to info for complex." /> - <xml-property name="nameProps" value="vnf-name" /> - <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,prov-status,service-id" /> - <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" /> - <xml-property name="uniqueProps" value="vnf-id" /> - <xml-property name="container" value="vpes" /> - <xml-property name="namespace" value="network" /> - <xml-property name="extends" value="vnf" /> - </xml-properties> - </java-type> <java-type name="Vnfcs"> <xml-properties> @@ -3795,22 +3652,22 @@ <xml-properties> <xml-property name="description" value="English description of Network function that the specific VNF deployment is providing" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String"> <xml-properties> <xml-property name="description" value="role in the network that this model will be providing" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="nfNamingCode" name="nf-naming-code" type="java.lang.String"> <xml-properties> <xml-property name="description" value="string assigned to this model used for naming purposes" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Path to the controller object." /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" /> @@ -4009,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 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"> @@ -4247,7 +4104,7 @@ <xml-properties> <xml-property name="description" value="Name of the service Provider on this link." /> </xml-properties> - </xml-element> + </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." /> @@ -4555,7 +4412,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v11.ModelVer" /> </java-attributes> </java-type> - + <java-type name="ModelVer"> <xml-root-element name="model-ver" /> <xml-properties> @@ -4970,7 +4827,7 @@ <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any" /> </java-attributes> </java-type> - + <java-type name="SecondaryFilts"> <xml-properties> <xml-property name="description" value="SecondaryFilts for performing a named-query or model query" /> @@ -4980,7 +4837,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v11.SecondaryFilt" /> </java-attributes> </java-type> - + <java-type name="SecondaryFilt"> <xml-properties> <xml-property name="description" value="SecondaryFilt for performing a named-query or model query" /> @@ -5054,7 +4911,7 @@ <xml-any-element java-attribute="propertyValue" lax="true" name="property-value" /> </java-attributes> </java-type> - + <java-type name="RouteTableReferences"> <xml-properties> <xml-property name="description" value="Collection of openstack route table references" /> @@ -5064,7 +4921,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v11.RouteTableReference" /> </java-attributes> </java-type> - + <java-type name="RouteTableReference"> <xml-root-element name="route-table-reference" /> <java-attributes> @@ -5085,7 +4942,7 @@ </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> - + <xml-properties> <xml-property name="description" value="Openstack route table reference." /> <xml-property name="nameProps" value="route-table-reference-fqdn" /> @@ -5095,7 +4952,7 @@ <xml-property name="namespace" value="network" /> </xml-properties> </java-type> - + <java-type name="InstanceGroups"> <xml-properties> <xml-property name="description" value="Collection of openstack route table references" /> @@ -5105,7 +4962,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v11.InstanceGroup" /> </java-attributes> </java-type> - + <java-type name="InstanceGroup"> <xml-root-element name="instance-group" /> <java-attributes> @@ -5136,7 +4993,7 @@ </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> - + <xml-properties> <xml-property name="description" value="General mechanism for grouping instances" /> <xml-property name="nameProps" value="description" /> @@ -5146,7 +5003,7 @@ <xml-property name="namespace" value="network" /> </xml-properties> </java-type> - + <java-type name="SegmentationAssignments"> <xml-properties> @@ -5157,7 +5014,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v11.SegmentationAssignment" /> </java-attributes> </java-type> - + <java-type name="SegmentationAssignment"> <xml-root-element name="segmentation-assignment" /> <java-attributes> @@ -5180,7 +5037,7 @@ <xml-property name="container" value="segmentation-assignments" /> </xml-properties> </java-type> - + <java-type name="AllottedResources"> <xml-properties> <xml-property name="description" value="This object is used to store slices of services being offered" /> @@ -5190,7 +5047,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v11.AllottedResource" /> </java-attributes> </java-type> - + <java-type name="AllottedResource"> <xml-root-element name="allotted-resource" /> <java-attributes> @@ -5247,7 +5104,7 @@ <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v11.TunnelXconnects" /> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> - + <xml-properties> <xml-property name="description" value="Represents a slice or partial piece of a resource that gets separately allotted" /> <xml-property name="nameProps" value="description" /> @@ -5257,8 +5114,8 @@ <xml-property name="container" value="allotted-resources" /> <!-- <xml-property name="namespace" value="network" /> --> </xml-properties> - </java-type> - + </java-type> + <java-type name="TunnelXconnects"> <xml-properties> <xml-property name="description" value="This object is used to store the specific tunnel cross connect aspects of an allotted resource" /> @@ -5268,7 +5125,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v11.TunnelXconnect" /> </java-attributes> </java-type> - + <java-type name="TunnelXconnect"> <xml-root-element name="tunnel-xconnect" /> <java-attributes> @@ -5304,7 +5161,7 @@ </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> - + <xml-properties> <xml-property name="description" value="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted" /> <xml-property name="uniqueProps" value="id" /> @@ -5314,7 +5171,7 @@ <!-- <xml-property name="namespace" value="network" /> --> </xml-properties> </java-type> - + <java-type name="Entitlements"> <xml-properties> <xml-property name="description" value="Entitlements, keyed by group-uuid and resource-uuid, related to license management" /> @@ -5324,7 +5181,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v11.Entitlement" /> </java-attributes> </java-type> - + <java-type name="Entitlement"> <xml-root-element name="entitlement" /> <java-attributes> @@ -5352,8 +5209,8 @@ <xml-property name="container" value="entitlements" /> </xml-properties> </java-type> - - + + <java-type name="Licenses"> <xml-properties> <xml-property name="description" value="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management" /> @@ -5363,7 +5220,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v11.License" /> </java-attributes> </java-type> - + <java-type name="License"> <xml-root-element name="license" /> <java-attributes> @@ -5391,7 +5248,7 @@ <xml-property name="container" value="licenses" /> </xml-properties> </java-type> - + <java-type name="Vnf"> <xml-root-element name="vnf"/> <java-attributes> @@ -5405,11 +5262,11 @@ <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> - + <java-type name="Zones"> <xml-properties> <xml-property name="description" value="Collection of zones" /> @@ -5464,6 +5321,6 @@ <xml-property name="namespace" value="network" /> </xml-properties> </java-type> - + </java-types> </xml-bindings> diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml index 3ed2ea53..d8f81533 100644 --- a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml +++ b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml @@ -553,7 +553,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,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> @@ -915,7 +915,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" /> @@ -1301,7 +1301,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,pnf" /> + <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf" /> <xml-property name="container" value="lag-interfaces" /> </xml-properties> </java-type> @@ -1358,7 +1358,7 @@ <xml-element java-attribute="customers" name="customers" type="inventory.aai.openecomp.org.v8.Customers" /> </java-attributes> </java-type> - + <java-type name="Customers"> <xml-properties> <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information." /> @@ -1892,7 +1892,7 @@ <xml-property name="namespace" value="network" /> </xml-properties> </java-type> - + <java-type name="CtagAssignments"> <xml-root-element name="ctag-assignments" /> <java-attributes> @@ -2502,7 +2502,7 @@ <xml-element java-attribute="status" name="status" type="java.lang.String" /> </java-attributes> </java-type> - + <java-type name="AaiInternal"> <xml-root-element name="aai-internal" /> <java-attributes> @@ -2510,7 +2510,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.openecomp.org.v8.EdgePropNames" /> </java-attributes> </java-type> - + <java-type name="ReservedPropNames"> <xml-properties> <xml-property name="description" value="Internal map to define some reserved properties of a vertex" /> @@ -2527,7 +2527,7 @@ <xml-element java-attribute="sourceOfTruth" name="source-of-truth" type="java.lang.String" /> </java-attributes> </java-type> - + <java-type name="EdgePropNames"> <!-- NOTE that the names of these properties are not consistent and are in mixed case and hyphen case for now --> <xml-properties> @@ -2546,7 +2546,7 @@ <xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" type="java.lang.String" /> </java-attributes> </java-type> - + <java-type name="Services"> <xml-properties> <xml-property name="description" value="Collection of service model definitions. Likely to be deprecated in favor of models from SDC."/> @@ -2556,7 +2556,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.openecomp.org.v8.Service" /> </java-attributes> </java-type> - + <java-type name="Service"> <xml-root-element name="service" /> <java-attributes> @@ -3038,7 +3038,7 @@ <xml-any-element java-attribute="propertyValue" lax="true" name="property-value" /> </java-attributes> </java-type> - + <java-type name="SegmentationAssignments"> <xml-properties> <xml-property name="description" value="Collection of openstack segmentation assignments" /> @@ -3071,6 +3071,6 @@ <xml-property name="container" value="segmentation-assignments" /> </xml-properties> </java-type> - + </java-types> </xml-bindings> diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml index dab82440..bbe5a8fe 100644 --- a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml +++ b/aai-core/src/test/resources/bundleconfig-local/etc/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> @@ -1197,7 +1197,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" /> @@ -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" /> @@ -2733,7 +2732,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"> @@ -3037,146 +3036,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> @@ -3994,12 +3854,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"> @@ -5330,7 +5190,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> @@ -5369,7 +5229,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> @@ -5387,7 +5247,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-core/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml b/aai-core/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml index 27f03332..712e7cae 100644 --- a/aai-core/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml +++ b/aai-core/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> @@ -1213,7 +1213,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" /> @@ -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> @@ -1751,7 +1751,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> @@ -2353,7 +2353,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" /> @@ -2796,7 +2795,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"> @@ -3100,146 +3099,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> @@ -4099,12 +3959,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"> @@ -5449,7 +5309,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> @@ -5488,7 +5348,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> @@ -5506,7 +5366,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> |