From a84e52f06e453e9fb405c3dcb0e3e4d5e6ffbd1a Mon Sep 17 00:00:00 2001 From: "Lin, Jerry (jl319x)" Date: Mon, 14 Aug 2017 16:33:47 -0400 Subject: [AAI-149 Amsterdam] migrate vpe Change-Id: I6189a8175425f4b7301659fce96f4c359dc6473a Signed-off-by: Lin, Jerry (jl319x) --- .../main/resources/aai_schema/aai_schema_v10.xsd | 201 +------ .../main/resources/aai_schema/aai_schema_v11.xsd | 638 ++++++++------------- .../main/resources/aai_schema/aai_schema_v8.xsd | 61 -- .../main/resources/aai_schema/aai_schema_v9.xsd | 201 +------ aai-schema/src/main/resources/oxm/aai_oxm_v10.xml | 158 +---- aai-schema/src/main/resources/oxm/aai_oxm_v11.xml | 255 ++------ aai-schema/src/main/resources/oxm/aai_oxm_v8.xml | 153 +---- aai-schema/src/main/resources/oxm/aai_oxm_v9.xml | 159 +---- 8 files changed, 325 insertions(+), 1501 deletions(-) (limited to 'aai-schema') 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" - @org.openecomp.aai.annotations.Metadata(description="Collection of digital virtual switch metadata used for vmWare VCEs and VPEs.") + @org.openecomp.aai.annotations.Metadata(description="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs.") @@ -1034,7 +1034,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @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") + @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") @@ -1917,7 +1917,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @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") + @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") @@ -3849,7 +3849,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @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).") + @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).") @@ -4078,7 +4078,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.openecomp.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce,vpe",container="licenses") + @org.openecomp.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses") @@ -4123,7 +4123,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.openecomp.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce,vpe",container="entitlements") + @org.openecomp.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements") @@ -4324,188 +4324,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - - @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") - - - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF. This is unique across the graph.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Name of VNF.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.") - - - - - - - @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.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Unique identifier of service. Does not map strictly to ASDC services. SOON TO BE DEPRECATED") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="OBSOLETE - do not use. See child relationships.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE") - - - - - - - @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).") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Prefix length for oam-address") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Gateway address") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Loopback0 address") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Temporary location for stag to get to VCE") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="as-number of the VPE") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="details regarding the vpe operation, PLEASE DISCONTINUE USE OF THIS FIELD.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="indicates whether vpe access uses SSH") - - - - - - - - - - - - - - - - @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.") - - - - - - - @@ -5609,14 +5427,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @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).") + @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).") - @org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value, e.g., VPE.") + @org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value.") @@ -6337,7 +6155,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @@ -6645,7 +6462,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.openecomp.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,vpe,generic-vnf",isAbstract="true") + @org.openecomp.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true") 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" - @org.openecomp.aai.annotations.Metadata(description="Collection of digital virtual switch metadata used for vmWare VCEs and VPEs.") + @org.openecomp.aai.annotations.Metadata(description="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs.") @@ -1041,7 +1041,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @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") + @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") @@ -1984,7 +1984,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @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") + @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") @@ -3994,7 +3994,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @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).") + @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).") @@ -4469,188 +4469,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - - @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") - - - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF. This is unique across the graph.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Name of VNF.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.") - - - - - - - @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.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Unique identifier of service. Does not map strictly to ASDC services. SOON TO BE DEPRECATED") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="OBSOLETE - do not use. See child relationships.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE") - - - - - - - @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).") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Prefix length for oam-address") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Gateway address") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Loopback0 address") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Temporary location for stag to get to VCE") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="as-number of the VPE") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="details regarding the vpe operation, PLEASE DISCONTINUE USE OF THIS FIELD.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="indicates whether vpe access uses SSH") - - - - - - - - - - - - - - - - @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.") - - - - - - - @@ -5803,14 +5621,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @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).") + @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).") - @org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value, e.g., VPE.") + @org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value.") @@ -6347,250 +6165,55 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - @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") + @org.openecomp.aai.annotations.Metadata(description="Namespace for network inventory resources.") - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="FQDN entry in the route table.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Concurrency value") - - - - + + + + + + + + + + + + + + + - + - @org.openecomp.aai.annotations.Metadata(description="Collection of openstack route table references") + @org.openecomp.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri") - + + + + + + + - + - @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") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="role of the instance group.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="ASDC model id for this resource or service model.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="ASDC model version uid for this resource model.") - - - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Instance Group ID, UUID assigned to this instance.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Descriptive text to help identify the usage of this instance-group") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Concurrency value") - - - - - - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Collection of openstack route table references") - - - - - - - - - - - - @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") - - - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Code assigned by AIC to the zone") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="English name associated with the zone") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Design of zone [Medium/Large?]") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Context of zone [production/test]") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Status of a zone.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Concurrency value") - - - - - - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Collection of zones") - - - - - - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Namespace for network inventory resources.") - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri") - - - - - - - - - - - - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV") + @org.openecomp.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV") @@ -6857,11 +6480,136 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + + @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") + + + + + + + @org.openecomp.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.") + + + + + + + @org.openecomp.aai.annotations.Metadata(description="FQDN entry in the route table.") + + + + + + + @org.openecomp.aai.annotations.Metadata(description="Concurrency value") + + + + + + + + + + + + @org.openecomp.aai.annotations.Metadata(description="Collection of openstack route table references") + + + + + + + + + + + + @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") + + + + + + + @org.openecomp.aai.annotations.Metadata(description="role of the instance group.") + + + + + + + @org.openecomp.aai.annotations.Metadata(description="ASDC model id for this resource or service model.") + + + + + + + @org.openecomp.aai.annotations.Metadata(description="ASDC model version uid for this resource model.") + + + + + + + @org.openecomp.aai.annotations.Metadata(isKey=true,description="Instance Group ID, UUID assigned to this instance.") + + + + + + + @org.openecomp.aai.annotations.Metadata(description="Descriptive text to help identify the usage of this instance-group") + + + + + + + @org.openecomp.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability") + + + + + + + @org.openecomp.aai.annotations.Metadata(description="Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]") + + + + + + + @org.openecomp.aai.annotations.Metadata(description="Concurrency value") + + + + + + + + + + + + @org.openecomp.aai.annotations.Metadata(description="Collection of openstack route table references") + + + + + + + - @org.openecomp.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,vpe,generic-vnf",isAbstract="true") + @org.openecomp.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true") @@ -6875,4 +6623,70 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + + @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") + + + + + + + @org.openecomp.aai.annotations.Metadata(isKey=true,description="Code assigned by AIC to the zone") + + + + + + + @org.openecomp.aai.annotations.Metadata(description="English name associated with the zone") + + + + + + + @org.openecomp.aai.annotations.Metadata(description="Design of zone [Medium/Large?]") + + + + + + + @org.openecomp.aai.annotations.Metadata(description="Context of zone [production/test]") + + + + + + + @org.openecomp.aai.annotations.Metadata(description="Status of a zone.") + + + + + + + @org.openecomp.aai.annotations.Metadata(description="Concurrency value") + + + + + + + + + + + + @org.openecomp.aai.annotations.Metadata(description="Collection of zones") + + + + + + + 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2305,7 +2245,6 @@ - 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" - @org.openecomp.aai.annotations.Metadata(description="Collection of digital virtual switch metadata used for vmWare VCEs and VPEs.") + @org.openecomp.aai.annotations.Metadata(description="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs.") @@ -1027,7 +1027,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @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") + @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") @@ -1888,7 +1888,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @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") + @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") @@ -3760,7 +3760,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @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).") + @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).") @@ -3989,7 +3989,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.openecomp.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce,vpe",container="licenses") + @org.openecomp.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses") @@ -4034,7 +4034,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.openecomp.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce,vpe",container="entitlements") + @org.openecomp.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements") @@ -4235,188 +4235,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - - @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") - - - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF. This is unique across the graph.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Name of VNF.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.") - - - - - - - @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.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Unique identifier of service. Does not map strictly to ASDC services. SOON TO BE DEPRECATED") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational",dbAlias="operational-status") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="OBSOLETE - do not use. See child relationships.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE") - - - - - - - @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).") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Prefix length for oam-address") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Gateway address") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Loopback0 address") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Temporary location for stag to get to VCE") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="as-number of the VPE") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="details regarding the vpe operation, PLEASE DISCONTINUE USE OF THIS FIELD.") - - - - - - - @org.openecomp.aai.annotations.Metadata(description="indicates whether vpe access uses SSH") - - - - - - - - - - - - - - - - @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.") - - - - - - - @@ -5457,14 +5275,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @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).") + @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).") - @org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value, e.g., VPE.") + @org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value.") @@ -6185,7 +6003,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @@ -6485,7 +6302,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.openecomp.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,vpe,generic-vnf",isAbstract="true") + @org.openecomp.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true") 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 @@ - + @@ -1381,7 +1381,7 @@ - + @@ -1752,7 +1752,7 @@ - + @@ -2353,7 +2353,6 @@ - @@ -2751,7 +2750,7 @@ - + @@ -3055,146 +3054,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4065,12 +3925,12 @@ - + - + @@ -5417,7 +5277,7 @@ - + @@ -5456,7 +5316,7 @@ - + @@ -5474,7 +5334,7 @@ - + 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 @@ - + - + - + @@ -751,7 +751,7 @@ - + @@ -762,7 +762,7 @@ - + @@ -960,7 +960,7 @@ - + @@ -981,7 +981,7 @@ - + @@ -1162,7 +1162,7 @@ - + @@ -1170,9 +1170,9 @@ - + - + @@ -1240,9 +1240,9 @@ - + - + @@ -1252,7 +1252,7 @@ - + @@ -1265,7 +1265,7 @@ - + @@ -1275,12 +1275,12 @@ - + - + @@ -1291,7 +1291,7 @@ - + @@ -1399,7 +1399,7 @@ - + @@ -1743,7 +1743,7 @@ - + @@ -1785,8 +1785,8 @@ - - + + @@ -2429,7 +2429,6 @@ - @@ -2439,9 +2438,6 @@ - - - @@ -2689,7 +2685,7 @@ - + @@ -2837,7 +2833,7 @@ - + @@ -3141,146 +3137,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3681,7 +3538,7 @@ - + @@ -3941,17 +3798,17 @@ - + - + - + @@ -4190,12 +4047,12 @@ - + - + @@ -4428,7 +4285,7 @@ - + @@ -4736,7 +4593,7 @@ - + @@ -5151,7 +5008,7 @@ - + @@ -5161,7 +5018,7 @@ - + @@ -5235,7 +5092,7 @@ - + @@ -5245,7 +5102,7 @@ - + @@ -5266,7 +5123,7 @@ - + @@ -5276,7 +5133,7 @@ - + @@ -5286,7 +5143,7 @@ - + @@ -5334,7 +5191,7 @@ - + @@ -5345,7 +5202,7 @@ - + @@ -5356,7 +5213,7 @@ - + @@ -5379,7 +5236,7 @@ - + @@ -5389,7 +5246,7 @@ - + @@ -5459,7 +5316,7 @@ - + @@ -5469,8 +5326,8 @@ - - + + @@ -5480,7 +5337,7 @@ - + @@ -5516,7 +5373,7 @@ - + @@ -5526,7 +5383,7 @@ - + @@ -5536,7 +5393,7 @@ - + @@ -5564,8 +5421,8 @@ - - + + @@ -5575,7 +5432,7 @@ - + @@ -5603,7 +5460,7 @@ - + @@ -5617,11 +5474,11 @@ - + - + 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 @@ - + @@ -1327,7 +1327,7 @@ - + @@ -1622,7 +1622,7 @@ - + @@ -2210,7 +2210,6 @@ - @@ -2583,7 +2582,7 @@ - + @@ -2886,145 +2885,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3803,12 +3664,12 @@ - + - + @@ -4781,7 +4642,7 @@ - + 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 @@ - + @@ -1364,7 +1364,7 @@ - + @@ -1723,7 +1723,7 @@ - + @@ -2325,7 +2325,6 @@ - @@ -2735,7 +2734,7 @@ - + @@ -3040,147 +3039,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4007,12 +3866,12 @@ - + - + @@ -5345,7 +5204,7 @@ - + @@ -5384,7 +5243,7 @@ - + @@ -5402,7 +5261,7 @@ - + -- cgit 1.2.3-korg