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-schema/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-schema/src')
| -rw-r--r-- | aai-schema/src/main/resources/aai_schema/aai_schema_v10.xsd | 201 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd | 582 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/aai_schema/aai_schema_v8.xsd | 61 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/aai_schema/aai_schema_v9.xsd | 201 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/oxm/aai_oxm_v10.xml | 158 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/oxm/aai_oxm_v11.xml | 255 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/oxm/aai_oxm_v8.xml | 153 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/oxm/aai_oxm_v9.xml | 159 |
8 files changed, 297 insertions, 1473 deletions
diff --git a/aai-schema/src/main/resources/aai_schema/aai_schema_v10.xsd b/aai-schema/src/main/resources/aai_schema/aai_schema_v10.xsd index b8521fd3..1fbdcf4a 100644 --- a/aai-schema/src/main/resources/aai_schema/aai_schema_v10.xsd +++ b/aai-schema/src/main/resources/aai_schema/aai_schema_v10.xsd @@ -272,7 +272,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of digital virtual switch metadata used for vmWare VCEs and VPEs.")</annox:annotate> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -1034,7 +1034,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,vpe,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -1917,7 +1917,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpe,vpls-pe,pnf",container="lag-interfaces")</annox:annotate> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3849,7 +3849,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="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).")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> @@ -4078,7 +4078,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce,vpe",container="licenses")</annox:annotate> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -4123,7 +4123,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce,vpe",container="entitlements")</annox:annotate> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -4324,188 +4324,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="vpe"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Relationship-list must include related to info for complex.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vpes",namespace="network",extendsFrom="vnf")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element name="vnf-id" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF. This is unique across the graph.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="vnf-name" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="vnf-name2" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="vnf-type" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="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.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="service-id" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service. Does not map strictly to ASDC services. SOON TO BE DEPRECATED")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="prov-status" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="operational-status" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="license-key" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="OBSOLETE - do not use. See child relationships.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="equipment-role" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="orchestration-status" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="heat-stack-id" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix length for oam-address")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Gateway address")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="v4-loopback0-ip-address" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Loopback0 address")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Temporary location for stag to get to VCE")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="as-number" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="as-number of the VPE")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="resource-version" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="summary-status" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="details regarding the vpe operation, PLEASE DISCONTINUE USE OF THIS FIELD.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="encrypted-access-flag" type="xs:boolean" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates whether vpe access uses SSH")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element ref="tns:relationship-list" minOccurs="0"/> - <xs:element ref="tns:l-interfaces" minOccurs="0"/> - <xs:element ref="tns:lag-interfaces" minOccurs="0"/> - <xs:element ref="tns:licenses" minOccurs="0"/> - <xs:element ref="tns:entitlements" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="vpes"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual provider edge router. In 1504, A&AI will populate this object through an M&P and tool provided to operations.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:vpe" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="vnfc"> <xs:complexType> <xs:annotation> @@ -5609,14 +5427,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="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).")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> <xs:element name="equipment-role" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value, e.g., VPE.")</annox:annotate> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> @@ -6337,7 +6155,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:element ref="tns:vpls-pes" minOccurs="0"/> <xs:element ref="tns:multicast-configurations" minOccurs="0"/> <xs:element ref="tns:vces" minOccurs="0"/> - <xs:element ref="tns:vpes" minOccurs="0"/> <xs:element ref="tns:vnfcs" minOccurs="0"/> <xs:element ref="tns:l3-networks" minOccurs="0"/> <xs:element ref="tns:network-policies" minOccurs="0"/> @@ -6645,7 +6462,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,vpe,generic-vnf",isAbstract="true")</annox:annotate> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> diff --git a/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd b/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd index 9abf1523..e05de44f 100644 --- a/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd +++ b/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd @@ -272,7 +272,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of digital virtual switch metadata used for vmWare VCEs and VPEs.")</annox:annotate> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -1041,7 +1041,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,vpe,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -1984,7 +1984,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpe,vpls-pe,pnf",container="lag-interfaces")</annox:annotate> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe",container="lag-interfaces")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3994,7 +3994,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="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).")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> @@ -4469,188 +4469,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="vpe"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Relationship-list must include related to info for complex.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vpes",namespace="network",extendsFrom="vnf")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element name="vnf-id" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF. This is unique across the graph.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="vnf-name" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="vnf-name2" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="vnf-type" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="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.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="service-id" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service. Does not map strictly to ASDC services. SOON TO BE DEPRECATED")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="prov-status" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="operational-status" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="license-key" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="OBSOLETE - do not use. See child relationships.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="equipment-role" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="orchestration-status" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="heat-stack-id" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix length for oam-address")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Gateway address")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="v4-loopback0-ip-address" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Loopback0 address")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Temporary location for stag to get to VCE")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="as-number" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="as-number of the VPE")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="resource-version" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="summary-status" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="details regarding the vpe operation, PLEASE DISCONTINUE USE OF THIS FIELD.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="encrypted-access-flag" type="xs:boolean" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates whether vpe access uses SSH")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element ref="tns:relationship-list" minOccurs="0"/> - <xs:element ref="tns:l-interfaces" minOccurs="0"/> - <xs:element ref="tns:lag-interfaces" minOccurs="0"/> - <xs:element ref="tns:licenses" minOccurs="0"/> - <xs:element ref="tns:entitlements" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="vpes"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual provider edge router. In 1504, A&AI will populate this object through an M&P and tool provided to operations.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:vpe" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="vnfc"> <xs:complexType> <xs:annotation> @@ -5803,14 +5621,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="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).")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> <xs:element name="equipment-role" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value, e.g., VPE.")</annox:annotate> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> @@ -6347,197 +6165,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="route-table-reference"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element name="route-table-reference-id" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="route-table-reference-fqdn" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="FQDN entry in the route table.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="resource-version" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element ref="tns:relationship-list" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="route-table-references"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack route table references")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:route-table-reference" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="instance-group"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element name="instance-group-role" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="role of the instance group.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="model-invariant-id" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ASDC model id for this resource or service model.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="model-version-id" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ASDC model version uid for this resource model.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="id" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Instance Group ID, UUID assigned to this instance.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="description" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Descriptive text to help identify the usage of this instance-group")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="type" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="sub-type" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="resource-version" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element ref="tns:relationship-list" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="instance-groups"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack route table references")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:instance-group" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="zone"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element name="zone-id" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Code assigned by AIC to the zone")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="zone-name" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="English name associated with the zone")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="design-type" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Design of zone [Medium/Large?]")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="zone-context" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Context of zone [production/test]")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="status" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Status of a zone.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="resource-version" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element ref="tns:relationship-list" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="zones"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of zones")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:zone" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="network"> <xs:complexType> <xs:annotation> @@ -6552,7 +6179,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:element ref="tns:vpls-pes" minOccurs="0"/> <xs:element ref="tns:multicast-configurations" minOccurs="0"/> <xs:element ref="tns:vces" minOccurs="0"/> - <xs:element ref="tns:vpes" minOccurs="0"/> <xs:element ref="tns:vnfcs" minOccurs="0"/> <xs:element ref="tns:l3-networks" minOccurs="0"/> <xs:element ref="tns:network-policies" minOccurs="0"/> @@ -6562,9 +6188,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:element ref="tns:pnfs" minOccurs="0"/> <xs:element ref="tns:physical-links" minOccurs="0"/> <xs:element ref="tns:ipsec-configurations" minOccurs="0"/> - <xs:element ref="tns:route-table-references" minOccurs="0"/> - <xs:element ref="tns:instance-groups" minOccurs="0"/> - <xs:element ref="tns:zones" minOccurs="0"/> </xs:sequence> </xs:complexType> </xs:element> @@ -6857,11 +6480,136 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="route-table-reference"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element name="route-table-reference-id" type="xs:string"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="route-table-reference-fqdn" type="xs:string"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="FQDN entry in the route table.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="resource-version" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element ref="tns:relationship-list" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="route-table-references"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack route table references")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element ref="tns:route-table-reference" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="instance-group"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element name="instance-group-role" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="role of the instance group.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="model-invariant-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ASDC model id for this resource or service model.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="model-version-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ASDC model version uid for this resource model.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="id" type="xs:string"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Instance Group ID, UUID assigned to this instance.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="description" type="xs:string"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Descriptive text to help identify the usage of this instance-group")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="type" type="xs:string"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="sub-type" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="resource-version" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element ref="tns:relationship-list" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="instance-groups"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack route table references")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element ref="tns:instance-group" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="vnf"> <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,vpe,generic-vnf",isAbstract="true")</annox:annotate> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6875,4 +6623,70 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="zone"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element name="zone-id" type="xs:string"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Code assigned by AIC to the zone")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="zone-name" type="xs:string"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="English name associated with the zone")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="design-type" type="xs:string"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Design of zone [Medium/Large?]")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="zone-context" type="xs:string"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Context of zone [production/test]")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="status" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Status of a zone.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="resource-version" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element ref="tns:relationship-list" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="zones"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of zones")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element ref="tns:zone" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> </xs:schema> diff --git a/aai-schema/src/main/resources/aai_schema/aai_schema_v8.xsd b/aai-schema/src/main/resources/aai_schema/aai_schema_v8.xsd index 5a16a458..a540aa80 100644 --- a/aai-schema/src/main/resources/aai_schema/aai_schema_v8.xsd +++ b/aai-schema/src/main/resources/aai_schema/aai_schema_v8.xsd @@ -1679,66 +1679,6 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="vpe"> - <xs:complexType> - <xs:sequence> - <xs:element name="vnf-id" type="xs:string"> - </xs:element> - <xs:element name="vnf-name" type="xs:string"> - </xs:element> - <xs:element name="vnf-name2" type="xs:string" minOccurs="0"> - </xs:element> - <xs:element name="vnf-type" type="xs:string"> - </xs:element> - <xs:element name="service-id" type="xs:string" minOccurs="0"> - </xs:element> - <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0"> - </xs:element> - <xs:element name="prov-status" type="xs:string" minOccurs="0"> - </xs:element> - <xs:element name="operational-state" type="xs:string" minOccurs="0"> - </xs:element> - <xs:element name="license-key" type="xs:string" minOccurs="0"> - </xs:element> - <xs:element name="equipment-role" type="xs:string" minOccurs="0"> - </xs:element> - <xs:element name="orchestration-status" type="xs:string" minOccurs="0"> - </xs:element> - <xs:element name="heat-stack-id" type="xs:string" minOccurs="0"> - </xs:element> - <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0"> - </xs:element> - <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0"> - </xs:element> - <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0"> - </xs:element> - <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0"> - </xs:element> - <xs:element name="v4-loopback0-ip-address" type="xs:string" minOccurs="0"> - </xs:element> - <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0"> - </xs:element> - <xs:element name="as-number" type="xs:string" minOccurs="0"> - </xs:element> - <xs:element name="resource-version" type="xs:string" minOccurs="0"> - </xs:element> - <xs:element name="summary-status" type="xs:string" minOccurs="0"> - </xs:element> - <xs:element name="encrypted-access-flag" type="xs:boolean" minOccurs="0"> - </xs:element> - <xs:element ref="tns:relationship-list" minOccurs="0"/> - <xs:element ref="tns:l-interfaces" minOccurs="0"/> - <xs:element ref="tns:lag-interfaces" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="vpes"> - <xs:complexType> - <xs:sequence> - <xs:element ref="tns:vpe" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="vnfc"> <xs:complexType> <xs:sequence> @@ -2305,7 +2245,6 @@ <xs:element ref="tns:vpls-pes" minOccurs="0"/> <xs:element ref="tns:multicast-configurations" minOccurs="0"/> <xs:element ref="tns:vces" minOccurs="0"/> - <xs:element ref="tns:vpes" minOccurs="0"/> <xs:element ref="tns:vnfcs" minOccurs="0"/> <xs:element ref="tns:l3-networks" minOccurs="0"/> <xs:element ref="tns:network-policies" minOccurs="0"/> diff --git a/aai-schema/src/main/resources/aai_schema/aai_schema_v9.xsd b/aai-schema/src/main/resources/aai_schema/aai_schema_v9.xsd index 6052df02..c8c7af23 100644 --- a/aai-schema/src/main/resources/aai_schema/aai_schema_v9.xsd +++ b/aai-schema/src/main/resources/aai_schema/aai_schema_v9.xsd @@ -272,7 +272,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of digital virtual switch metadata used for vmWare VCEs and VPEs.")</annox:annotate> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -1027,7 +1027,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,vpe,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -1888,7 +1888,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpe,vpls-pe,pnf",container="lag-interfaces")</annox:annotate> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3760,7 +3760,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> @@ -3989,7 +3989,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce,vpe",container="licenses")</annox:annotate> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -4034,7 +4034,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce,vpe",container="entitlements")</annox:annotate> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -4235,188 +4235,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="vpe"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Relationship-list must include related to info for complex.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vpes",namespace="network",extendsFrom="vnf")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element name="vnf-id" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF. This is unique across the graph.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="vnf-name" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="vnf-name2" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="vnf-type" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="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.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="service-id" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service. Does not map strictly to ASDC services. SOON TO BE DEPRECATED")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="prov-status" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="operational-state" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational",dbAlias="operational-status")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="license-key" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="OBSOLETE - do not use. See child relationships.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="equipment-role" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="orchestration-status" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="heat-stack-id" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix length for oam-address")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Gateway address")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="v4-loopback0-ip-address" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Loopback0 address")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Temporary location for stag to get to VCE")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="as-number" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="as-number of the VPE")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="resource-version" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="summary-status" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="details regarding the vpe operation, PLEASE DISCONTINUE USE OF THIS FIELD.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="encrypted-access-flag" type="xs:boolean" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates whether vpe access uses SSH")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element ref="tns:relationship-list" minOccurs="0"/> - <xs:element ref="tns:l-interfaces" minOccurs="0"/> - <xs:element ref="tns:lag-interfaces" minOccurs="0"/> - <xs:element ref="tns:licenses" minOccurs="0"/> - <xs:element ref="tns:entitlements" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="vpes"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual provider edge router. In 1504, A&AI will populate this object through an M&P and tool provided to operations.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:vpe" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="vnfc"> <xs:complexType> <xs:annotation> @@ -5457,14 +5275,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> <xs:element name="equipment-role" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value, e.g., VPE.")</annox:annotate> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> @@ -6185,7 +6003,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:element ref="tns:vpls-pes" minOccurs="0"/> <xs:element ref="tns:multicast-configurations" minOccurs="0"/> <xs:element ref="tns:vces" minOccurs="0"/> - <xs:element ref="tns:vpes" minOccurs="0"/> <xs:element ref="tns:vnfcs" minOccurs="0"/> <xs:element ref="tns:l3-networks" minOccurs="0"/> <xs:element ref="tns:network-policies" minOccurs="0"/> @@ -6485,7 +6302,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,vpe,generic-vnf",isAbstract="true")</annox:annotate> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v10.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v10.xml index 041c6e56..e1c41a5c 100644 --- a/aai-schema/src/main/resources/oxm/aai_oxm_v10.xml +++ b/aai-schema/src/main/resources/oxm/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> @@ -1381,7 +1381,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> @@ -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" /> @@ -2751,7 +2750,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"> @@ -3055,146 +3054,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="operationalStatus" name="operational-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indicator for whether the resource is considered operational" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="OBSOLETE - do not use. See child relationships." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Client should send valid enumerated value" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address)." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="Prefix length for oam-address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Gateway address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="v4Loopback0IpAddress" name="v4-loopback0-ip-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Loopback0 address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="Temporary location for stag to get to VCE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="asNumber" name="as-number" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="as-number of the VPE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="summaryStatus" name="summary-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="details regarding the vpe operation, PLEASE DISCONTINUE USE OF THIS FIELD." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="encryptedAccessFlag" name="encrypted-access-flag" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" value="indicates whether vpe access uses SSH" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.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> @@ -4065,12 +3925,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"> @@ -5417,7 +5277,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> @@ -5456,7 +5316,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> @@ -5474,7 +5334,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-schema/src/main/resources/oxm/aai_oxm_v11.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml index 9fae061b..396e364e 100644 --- a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml +++ b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml @@ -724,18 +724,18 @@ <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="isPortMirrored" name="is-port-mirrored" required="true" type="java.lang.Boolean"> <xml-properties> <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="boolean indicatating whether or not port is a mirrored." /> </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." /> @@ -751,7 +751,7 @@ <xml-properties> <xml-property name="description" value="Prov Status of the logical interface. Valid values [PREPROV/NVTPROV/PROV]." /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v11.Vlans" /> <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v11.SriovVfs" /> <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> @@ -762,7 +762,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> @@ -960,7 +960,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="vpnKey" name="vpn-key" type="java.lang.String"> <xml-properties> <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan" /> @@ -981,7 +981,7 @@ <xml-properties> <xml-property name="description" value="Prov Status of the VLAN configuration related to a logical interface. Valid values [PREPROV/NVTPROV/PROV]." /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv4AddressList" /> <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv6AddressList" /> @@ -1162,7 +1162,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" /> @@ -1170,9 +1170,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> @@ -1240,9 +1240,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" /> @@ -1252,7 +1252,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> @@ -1265,7 +1265,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" /> @@ -1275,12 +1275,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> @@ -1291,7 +1291,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> @@ -1399,7 +1399,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> @@ -1743,7 +1743,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." /> @@ -1785,8 +1785,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,interface-id,interface-role" /> + <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe" /> <xml-property name="container" value="lag-interfaces" /> </xml-properties> </java-type> @@ -2429,7 +2429,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" /> @@ -2439,9 +2438,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> @@ -2689,7 +2685,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." /> @@ -2837,7 +2833,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"> @@ -3141,146 +3137,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="operationalStatus" name="operational-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indicator for whether the resource is considered operational" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="OBSOLETE - do not use. See child relationships." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Client should send valid enumerated value" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address)." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="Prefix length for oam-address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Gateway address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="v4Loopback0IpAddress" name="v4-loopback0-ip-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Loopback0 address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="Temporary location for stag to get to VCE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="asNumber" name="as-number" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="as-number of the VPE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="summaryStatus" name="summary-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="details regarding the vpe operation, PLEASE DISCONTINUE USE OF THIS FIELD." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="encryptedAccessFlag" name="encrypted-access-flag" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" value="indicates whether vpe access uses SSH" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" /> - <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v11.Licenses" /> - <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v11.Entitlements" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Relationship-list must include related to info for complex." /> - <xml-property name="nameProps" value="vnf-name" /> - <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,prov-status,service-id" /> - <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" /> - <xml-property name="uniqueProps" value="vnf-id" /> - <xml-property name="container" value="vpes" /> - <xml-property name="namespace" value="network" /> - <xml-property name="extends" value="vnf" /> - </xml-properties> - </java-type> <java-type name="Vnfcs"> <xml-properties> @@ -3681,7 +3538,7 @@ <xml-properties> <xml-property name="description" value="role of the subnet, referenced when assigning IPs" /> </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." /> @@ -3941,17 +3798,17 @@ <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." /> @@ -4190,12 +4047,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"> @@ -4428,7 +4285,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." /> @@ -4736,7 +4593,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> @@ -5151,7 +5008,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" /> @@ -5161,7 +5018,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" /> @@ -5235,7 +5092,7 @@ <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" /> </java-attributes> </java-type> - + <java-type name="RouteTableReferences"> <xml-properties> <xml-property name="description" value="Collection of openstack route table references" /> @@ -5245,7 +5102,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> @@ -5266,7 +5123,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" /> @@ -5276,7 +5133,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" /> @@ -5286,7 +5143,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> @@ -5334,7 +5191,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" /> @@ -5345,7 +5202,7 @@ <xml-property name="namespace" value="network" /> </xml-properties> </java-type> - + <java-type name="SegmentationAssignments"> <xml-properties> @@ -5356,7 +5213,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> @@ -5379,7 +5236,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" /> @@ -5389,7 +5246,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> @@ -5459,7 +5316,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" /> @@ -5469,8 +5326,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" /> @@ -5480,7 +5337,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> @@ -5516,7 +5373,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" /> @@ -5526,7 +5383,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" /> @@ -5536,7 +5393,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> @@ -5564,8 +5421,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" /> @@ -5575,7 +5432,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> @@ -5603,7 +5460,7 @@ <xml-property name="container" value="licenses" /> </xml-properties> </java-type> - + <java-type name="Vnf"> <xml-root-element name="vnf"/> <java-attributes> @@ -5617,11 +5474,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" /> diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v8.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v8.xml index ba71f6ac..1adfdf8c 100644 --- a/aai-schema/src/main/resources/oxm/aai_oxm_v8.xml +++ b/aai-schema/src/main/resources/oxm/aai_oxm_v8.xml @@ -705,7 +705,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> @@ -1327,7 +1327,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> @@ -1622,7 +1622,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" /> @@ -2583,7 +2582,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"> @@ -2886,145 +2885,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-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="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> @@ -3803,12 +3664,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"> @@ -4781,7 +4642,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-schema/src/main/resources/oxm/aai_oxm_v9.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v9.xml index 8366cf10..0f061666 100644 --- a/aai-schema/src/main/resources/oxm/aai_oxm_v9.xml +++ b/aai-schema/src/main/resources/oxm/aai_oxm_v9.xml @@ -737,7 +737,7 @@ <xml-properties> <xml-property name="description" value="Logical interfaces, e.g., a vnic." /> <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name" /> - <xml-property name="dependentOn" value="generic-vnf,newvce,vpe,p-interface,vserver,lag-interface" /> + <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface" /> <xml-property name="container" value="l-interfaces" /> </xml-properties> </java-type> @@ -1364,7 +1364,7 @@ <java-type name="DvsSwitches"> <xml-properties> - <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and VPEs." /> + <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs." /> </xml-properties> <xml-root-element name="dvs-switches" /> <java-attributes> @@ -1723,7 +1723,7 @@ <xml-properties> <xml-property name="description" value="Link aggregate interface" /> <xml-property name="indexedProps" value="interface-name,interface-id,interface-role" /> - <xml-property name="dependentOn" value="generic-vnf,pserver,vpe,vpls-pe,pnf" /> + <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf" /> <xml-property name="container" value="lag-interfaces" /> </xml-properties> </java-type> @@ -2325,7 +2325,6 @@ <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.openecomp.org.v9.VplsPes" /> <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.openecomp.org.v9.MulticastConfigurations" /> <xml-element java-attribute="vces" name="vces" type="inventory.aai.openecomp.org.v9.Vces" /> - <xml-element java-attribute="vpes" name="vpes" type="inventory.aai.openecomp.org.v9.Vpes" /> <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.openecomp.org.v9.Vnfcs" /> <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.openecomp.org.v9.L3Networks" /> <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.openecomp.org.v9.NetworkPolicies" /> @@ -2735,7 +2734,7 @@ </xml-element> <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address)." /> + <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address)." /> </xml-properties> </xml-element> <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> @@ -3040,147 +3039,7 @@ </xml-properties> </java-type> - <java-type name="Vpes"> - <xml-properties> - <xml-property name="description" value="Virtual provider edge router. In 1504, A&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> @@ -4007,12 +3866,12 @@ </xml-element> <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address)." /> + <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address)." /> </xml-properties> </xml-element> <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Client should send valid enumerated value, e.g., VPE." /> + <xml-property name="description" value="Client should send valid enumerated value." /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> @@ -5345,7 +5204,7 @@ <xml-properties> <xml-property name="description" value="Metadata for entitlement group." /> <xml-property name="indexedProps" value="group-uuid,resource-uuid" /> - <xml-property name="dependentOn" value="generic-vnf,vce,vpe" /> + <xml-property name="dependentOn" value="generic-vnf,vce" /> <xml-property name="container" value="entitlements" /> </xml-properties> </java-type> @@ -5384,7 +5243,7 @@ <xml-properties> <xml-property name="description" value="Metadata for license group." /> <xml-property name="indexedProps" value="group-uuid,resource-uuid" /> - <xml-property name="dependentOn" value="generic-vnf,vce,vpe" /> + <xml-property name="dependentOn" value="generic-vnf,vce" /> <xml-property name="container" value="licenses" /> </xml-properties> </java-type> @@ -5402,7 +5261,7 @@ <xml-property name="description" value="Abstract vnf class" /> <xml-property name="indexedProps" value="vnf-id" /> <xml-property name="uniqueProps" value="vnf-id" /> - <xml-property name="inheritors" value="vce,vpe,generic-vnf" /> + <xml-property name="inheritors" value="vce,generic-vnf" /> <xml-property name="abstract" value="true" /> </xml-properties> </java-type> |