From: Harish Venkata Kajur Date: Mon, 26 Oct 2020 03:04:14 +0000 (-0400) Subject: Add back missing ccvpn network slicing elements X-Git-Tag: 1.7.11~2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=dfe20cfed6a140050697ba5a66e8f33fe759ac6d;p=aai%2Fschema-service.git Add back missing ccvpn network slicing elements Issue-ID: AAI-3211 Change-Id: Ia9babe5da53f98a88ffd754e4bd8e29405a261bf Signed-off-by: Harish Venkata Kajur --- diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml index 2a807f7..22ecd47 100644 --- a/aai-annotations/pom.xml +++ b/aai-annotations/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.schema-service schema-service - 1.7.10-SNAPSHOT + 1.7.11-SNAPSHOT aai-annotations aai-annotations diff --git a/aai-queries/pom.xml b/aai-queries/pom.xml index db5716c..c381b3c 100644 --- a/aai-queries/pom.xml +++ b/aai-queries/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.schema-service schema-service - 1.7.10-SNAPSHOT + 1.7.11-SNAPSHOT aai-queries aai-queries diff --git a/aai-schema-gen/pom.xml b/aai-schema-gen/pom.xml index af42eca..c91ee3d 100644 --- a/aai-schema-gen/pom.xml +++ b/aai-schema-gen/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.schema-service schema-service - 1.7.10-SNAPSHOT + 1.7.11-SNAPSHOT aai-schema-gen aai-schema-gen diff --git a/aai-schema-service/pom.xml b/aai-schema-service/pom.xml index 2b1dac8..e749294 100644 --- a/aai-schema-service/pom.xml +++ b/aai-schema-service/pom.xml @@ -26,7 +26,7 @@ org.onap.aai.schema-service schema-service - 1.7.10-SNAPSHOT + 1.7.11-SNAPSHOT org.onap.aai.schema-service aai-schema-service diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml index 4ac52c8..8bd0b42 100644 --- a/aai-schema/pom.xml +++ b/aai-schema/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.schema-service schema-service - 1.7.10-SNAPSHOT + 1.7.11-SNAPSHOT aai-schema aai-schema diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd index 133af0a..ade0517 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd @@ -4112,90 +4112,90 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - @org.onap.aai.annotations.Metadata(description="Percentage value of the amount of simultaneous active UEs to the total number of UEs where active means the UEs are exchanging data with the network.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The jitter requirements of network slice.") - - - - - - - @org.onap.aai.annotations.Metadata(description="An attribute specifies the time that an application consuming a communication service may continue without an anticipated message.") - - - - - - - @org.onap.aai.annotations.Metadata(description="This parameter specifies the availability requirement, expressed as a percentage.") - - - - - - - @org.onap.aai.annotations.Metadata(description="An attribute specifies in the context of network layer packet transmissions, percentage value of the amount of sent network layer packets successfully delivered to a given system entity within the time constraint required by the targeted service, divided by the total number of sent network layer packets.") - - - - - - - @org.onap.aai.annotations.Metadata(description="This attribute defines achievable data rate of the network slice in downlink that is available ubiquitously across the coverage area of the slice.") - - - - - - - @org.onap.aai.annotations.Metadata(description="This attribute defines downlink data rate supported by the network slice per UE.") - - - - - - - @org.onap.aai.annotations.Metadata(description="This attribute defines achievable data rate of the network slice in uplink that is available ubiquitously across the coverage area of the slice.") - - - - - - - @org.onap.aai.annotations.Metadata(description="uLThptPerUE Integer 1 This attribute defines uplink data rate supported by the network slice per UE.") - - - - - - - @org.onap.aai.annotations.Metadata(description="This parameter specifies the maximum packet size supported by the network slice.") - - - - - - - @org.onap.aai.annotations.Metadata(description="This parameter defines the maximum number of concurrent sessions supported by the network slice.") - - - - - - - @org.onap.aai.annotations.Metadata(description="An attribute specifies the overall user density over the coverage area of the network slice.") - - - + + + + @org.onap.aai.annotations.Metadata(description="Percentage value of the amount of simultaneous active UEs to the total number of UEs where active means the UEs are exchanging data with the network.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The jitter requirements of network slice.") + + + + + + + @org.onap.aai.annotations.Metadata(description="An attribute specifies the time that an application consuming a communication service may continue without an anticipated message.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This parameter specifies the availability requirement, expressed as a percentage.") + + + + + + + @org.onap.aai.annotations.Metadata(description="An attribute specifies in the context of network layer packet transmissions, percentage value of the amount of sent network layer packets successfully delivered to a given system entity within the time constraint required by the targeted service, divided by the total number of sent network layer packets.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This attribute defines achievable data rate of the network slice in downlink that is available ubiquitously across the coverage area of the slice.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This attribute defines downlink data rate supported by the network slice per UE.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This attribute defines achievable data rate of the network slice in uplink that is available ubiquitously across the coverage area of the slice.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This attribute defines uplink data rate supported by the network slice per UE.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This parameter specifies the maximum packet size supported by the network slice.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This parameter defines the maximum number of concurrent sessions supported by the network slice.") + + + + + + + @org.onap.aai.annotations.Metadata(description="An attribute specifies the overall user density over the coverage area of the network slice.") + + + @@ -4297,83 +4297,83 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - @org.onap.aai.annotations.Metadata(description="An attribute specfies the percentage value of the amount of simultaneous active UEs to the total number of UEs where active means the UEs are exchanging data with the network.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The jitter requirements of network slice subnet.") - - - - - - - @org.onap.aai.annotations.Metadata(description="survivalTime String 1 Survival time for network slice subnet.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Communica¬tion service availability target value.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Maxmun bandwidth value of TN network. ") - - - - - - - @org.onap.aai.annotations.Metadata(description="Expected date rate for uRLLC.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The maximum number of PDU sessions that can simultaneously/concurrently access to the network slice.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Overall User Density.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Communication service reliability mean time between failures.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Message size(byte) .") - - - - - - - @org.onap.aai.annotations.Metadata(description="Target value of transfer interval.") - - - + + + + @org.onap.aai.annotations.Metadata(description="An attribute specfies the percentage value of the amount of simultaneous active UEs to the total number of UEs where active means the UEs are exchanging data with the network.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The jitter requirements of network slice subnet.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Survival time for network slice subnet.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Communication service availability target value.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Maxmun bandwidth value of TN network.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Expected date rate for uRLLC.") + + + + + + + @org.onap.aai.annotations.Metadata(description="maxNumberofPDUSession Integer 1 The maximum number of PDU sessions that can simultaneously/concurrently access to the network slice.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Overall User Density.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Communication service reliability mean time between failures.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Message size(byte) .") + + + + + + + @org.onap.aai.annotations.Metadata(description="transferIntervalTarget String 1 Target value of transfer interval.") + + + @@ -10819,191 +10819,109 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - - @org.onap.aai.annotations.Metadata(description="Namespace for network inventory resources.") - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri") - - - - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV",uniqueProps="aai-uuid",indexedProps="aai-uuid") - - - - - - - - - - - - - - - - - - - - - - - + - @org.onap.aai.annotations.Metadata(description="Contacts store the vendor information and have a relationship to the generic-vnf. In 1902, this will be populated by SDN-GC",uniqueProps="contact-name",container="contacts",namespace="common",nameProps="contact-name,vendor-type",uriTemplate="/common/contacts/contact/{contact-name}",requiredProps="contact-name") + @org.onap.aai.annotations.Metadata(description="Instance of an label restriction",indexedProps="id,label-start,label-end,range-bitmap,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="label-restrictions",namespace="network",requiredProps="id",uriTemplate="/network/label-restrictions/label-restriction/{id}") - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Name of the contact") + @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the label restriction") - + - @org.onap.aai.annotations.Metadata(description="Tel no. of contact") + @org.onap.aai.annotations.Metadata(description="First number in the label range") - + - @org.onap.aai.annotations.Metadata(description="e-mail of contact") + @org.onap.aai.annotations.Metadata(description="Last number in the label range") - + - @org.onap.aai.annotations.Metadata(description="NI (Network Integrator)SI (System Integrator) 3rd Party LCM") + @org.onap.aai.annotations.Metadata(description="Bitmap of available labels starting from label-start to label-end.") - + - @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + @org.onap.aai.annotations.Metadata(description="Step of labels in label range.") - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Collection of contacts") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Profiles store the information (ex, credential-profile) and have a relationship to (ex, pnf)",uniqueProps="profile-name",container="profiles",namespace="common",nameProps="profile-name,profile-type",uriTemplate="/common/profiles/profile/{profile-name}",requiredProps="profile-name") - - - - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Name of the profile") + @org.onap.aai.annotations.Metadata(description="Indicate wheather range-bitmap items are inclusive or exclusive.") - + - @org.onap.aai.annotations.Metadata(description="Type of profile (ex,network-power-profile)") + @org.onap.aai.annotations.Metadata(description="Indicate the label range e.g.trib-slot, trib-port") - + - @org.onap.aai.annotations.Metadata(description="Set of characteristics of the profile.") + @org.onap.aai.annotations.Metadata(description="Indicate trib slot granularity.") - + - @org.onap.aai.annotations.Metadata(description="Descriptive subtype.") + @org.onap.aai.annotations.Metadata(description="Priority.") - + - @org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details") + @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") @@ -11018,112 +10936,79 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - - @org.onap.aai.annotations.Metadata(description="Collection of profiles") - - - - - - - - + - @org.onap.aai.annotations.Metadata(description="Namespace for common inventory resources.") + @org.onap.aai.annotations.Metadata(description="Collection of Label Restriction.") - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - @org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models",requiredProps="model-invariant-id,model-name-version-id,model-type,model-name,model-id,model-version") + @org.onap.aai.annotations.Metadata(description="Instance of an User network interface",indexedProps="id,tp-id,cvlan,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="unis",namespace="network",requiredProps="id",uriTemplate="/network/unis/uni/{id}") - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC") + @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the UNI") - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC") + @org.onap.aai.annotations.Metadata(description="Termination point ID.") - + - @org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.") + @org.onap.aai.annotations.Metadata(description="The cvlan for the site used for ethernet type connectivity.") - + - @org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.") + @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") - + - @org.onap.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version") + @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") - + - @org.onap.aai.annotations.Metadata(description="Version") + @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") - + - @org.onap.aai.annotations.Metadata(description="Description") + @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") @@ -11134,189 +11019,156 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - + - @org.onap.aai.annotations.Metadata(description="QueryParameters for performing a named-query or model query") + @org.onap.aai.annotations.Metadata(description="Collection of User network interface.") - - + - - - - - - + - @org.onap.aai.annotations.Metadata(description="InstanceFilters for performing a named-query or model query") + @org.onap.aai.annotations.Metadata(description="Instance of an te-link-attribute",indexedProps="id,link-protection-type,access-type,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="te-link-attributes",namespace="network",requiredProps="id",uriTemplate="/network/te-link-attributes/te-link-attribute/{id}") - + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the TE link attribute") + + + + + + + @org.onap.aai.annotations.Metadata(description="Indicate desired protection type of the link e.g, unprotected, shared or 1+1") + + + + + + + @org.onap.aai.annotations.Metadata(description="Indicate link access type e.g, point-to-point or multi-access.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Bandwidth available on link.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The type of ODU e.g, ODU1, ODU2, ODU3, ODU4.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The value of available bandwidth.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Indicate wheather link is abstract or native") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") + + + + + + + @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + + + + - - - - - - + - @org.onap.aai.annotations.Metadata(description="SecondaryFilts for performing a named-query or model query") + @org.onap.aai.annotations.Metadata(description="Collection of TE link attributes.") - + - + - @org.onap.aai.annotations.Metadata(description="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query") - - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Property holder for query properties or instance properties") - - - - - - - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Extra properties for inventory item for response list") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Inventory item for response list",container="inventory-response-items") - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Container for inventory items in response list",container="response-list") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Response container for the results of a named-query or model query") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true",requiredProps="vnf-id") - - - - - - - @org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF. This is unique across the graph.") - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Instance of an User network interface",indexedProps="id,tp-id,cvlan,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="unis",namespace="network",requiredProps="id",uriTemplate="/network/unis/uni/{id}") + @org.onap.aai.annotations.Metadata(description="Instance of an inter layer topology attachment",indexedProps="id,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="interlayer-attachments",namespace="network",requiredProps="id",uriTemplate="/network/interlayer-attachments/interlayer-attachment/{id}") - @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the UNI") - - - - - - - @org.onap.aai.annotations.Metadata(description="Termination point ID.") + @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the interlayer topology attachment") - + - @org.onap.aai.annotations.Metadata(description="The cvlan for the site used for ethernet type connectivity.") + @org.onap.aai.annotations.Metadata(description="Inter layer lock id") @@ -11327,13 +11179,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") - - - @@ -11366,145 +11211,86 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - @org.onap.aai.annotations.Metadata(description="Collection of User network interface.") + @org.onap.aai.annotations.Metadata(description="Collection of interlayer topology connectivities.") - + - + - @org.onap.aai.annotations.Metadata(description="Instance of an inter layer topology attachment",indexedProps="id,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="interlayer-attachments",namespace="network",requiredProps="id",uriTemplate="/network/interlayer-attachments/interlayer-attachment/{id}") + @org.onap.aai.annotations.Metadata(description="Instance of an tunnel termination point",indexedProps="ttp-id,tunnel-tp-id,name,operational-status,model-invariant-id,model-version-id",searchable="ttp-id",uniqueProps="ttp-id",container="tunnel-termination-points",namespace="network",requiredProps="ttp-id",uriTemplate="/network/tunnel-termination-points/tunnel-termination-point/{ttp-id}") - - - - @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the interlayer topology attachment") - - - - - - - @org.onap.aai.annotations.Metadata(description="Inter layer lock id") - - - - - - - @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") - - - - - - - @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") - - - - + - @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") + @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the tunnel termination point") - + - @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + @org.onap.aai.annotations.Metadata(description="TTP ID discovered from controller") - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Collection of interlayer topology connectivities.") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Instance of an te-link-attribute",indexedProps="id,link-protection-type,access-type,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="te-link-attributes",namespace="network",requiredProps="id",uriTemplate="/network/te-link-attributes/te-link-attribute/{id}") - - - - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the TE link attribute") + @org.onap.aai.annotations.Metadata(description="Name of tunnel termination point") - + - @org.onap.aai.annotations.Metadata(description="Indicate desired protection type of the link e.g, unprotected, shared or 1+1") + @org.onap.aai.annotations.Metadata(description="Admin status of TTP e.g, up,down,testing,preparing-maintenance,maintenance.") - + - @org.onap.aai.annotations.Metadata(description="Indicate link access type e.g, point-to-point or multi-access.") + @org.onap.aai.annotations.Metadata(description="Operational status of TTP e.g, up,down,testing,preparing-maintenance,maintenance.") - + - @org.onap.aai.annotations.Metadata(description="Bandwidth available on link.") + @org.onap.aai.annotations.Metadata(description="Indicate switching capability of TTP e.g,PSC-1, EVPL,L2SC,TDM,OTN.") - + - @org.onap.aai.annotations.Metadata(description="The type of ODU e.g, ODU1, ODU2, ODU3, ODU4.") + @org.onap.aai.annotations.Metadata(description="Encoding support by the TTP e.g, packet,ethernet,PDH,SDH,digital-wrapper,lambda,fiber,ODUK,line.") - + - @org.onap.aai.annotations.Metadata(description="The value of available bandwidth.") + @org.onap.aai.annotations.Metadata(description="Indicate supported protection type of this TTP e.g, unprotected,reroute,reroute-extra,1-for-n,unidir-1-to-1.") - + - @org.onap.aai.annotations.Metadata(description="Indicate wheather link is abstract or native") + @org.onap.aai.annotations.Metadata(description="correlation between related objects in ETH and OTN topology.") @@ -11554,121 +11340,142 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - @org.onap.aai.annotations.Metadata(description="Collection of TE link attributes.") + @org.onap.aai.annotations.Metadata(description="Collection of Tunnel Termination Point.") - + - + - @org.onap.aai.annotations.Metadata(description="Instance of an label restriction",indexedProps="id,label-start,label-end,range-bitmap,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="label-restrictions",namespace="network",requiredProps="id",uriTemplate="/network/label-restrictions/label-restriction/{id}") + @org.onap.aai.annotations.Metadata(description="Namespace for network inventory resources.") - - - - @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the label restriction") - - - - - - - @org.onap.aai.annotations.Metadata(description="First number in the label range") - - - - - - - @org.onap.aai.annotations.Metadata(description="Last number in the label range") - - - - - - - @org.onap.aai.annotations.Metadata(description="Bitmap of available labels starting from label-start to label-end.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Step of labels in label range.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Indicate wheather range-bitmap items are inclusive or exclusive.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Indicate the label range e.g.trib-slot, trib-port") - - - - - - - @org.onap.aai.annotations.Metadata(description="Indicate trib slot granularity.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Priority.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri") + + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV",uniqueProps="aai-uuid",indexedProps="aai-uuid") + + + + + + + + + + + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Contacts store the vendor information and have a relationship to the generic-vnf. In 1902, this will be populated by SDN-GC",uniqueProps="contact-name",container="contacts",namespace="common",nameProps="contact-name,vendor-type",uriTemplate="/common/contacts/contact/{contact-name}",requiredProps="contact-name") + + + + - @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") + @org.onap.aai.annotations.Metadata(isKey=true,description="Name of the contact") - + - @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") + @org.onap.aai.annotations.Metadata(description="Tel no. of contact") - + - @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + @org.onap.aai.annotations.Metadata(description="e-mail of contact") - + - @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") + @org.onap.aai.annotations.Metadata(description="NI (Network Integrator)SI (System Integrator) 3rd Party LCM") @@ -11683,121 +11490,178 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - @org.onap.aai.annotations.Metadata(description="Collection of Label Restriction.") + @org.onap.aai.annotations.Metadata(description="Collection of contacts") - + - + - @org.onap.aai.annotations.Metadata(description="Instance of an tunnel termination point",indexedProps="ttp-id,tunnel-tp-id,name,operational-status,model-invariant-id,model-version-id",searchable="ttp-id",uniqueProps="ttp-id",container="tunnel-termination-points",namespace="network",requiredProps="ttp-id",uriTemplate="/network/tunnel-termination-points/tunnel-termination-point/{ttp-id}") + @org.onap.aai.annotations.Metadata(description="Profiles store the information (ex, credential-profile) and have a relationship to (ex, pnf)",uniqueProps="profile-name",container="profiles",namespace="common",nameProps="profile-name,profile-type",uriTemplate="/common/profiles/profile/{profile-name}",requiredProps="profile-name") - - - - @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the tunnel termination point") - - - - + - @org.onap.aai.annotations.Metadata(description="TTP ID discovered from controller") + @org.onap.aai.annotations.Metadata(isKey=true,description="Name of the profile") - + - @org.onap.aai.annotations.Metadata(description="Name of tunnel termination point") + @org.onap.aai.annotations.Metadata(description="Type of profile (ex,network-power-profile)") - + - @org.onap.aai.annotations.Metadata(description="Admin status of TTP e.g, up,down,testing,preparing-maintenance,maintenance.") + @org.onap.aai.annotations.Metadata(description="Set of characteristics of the profile.") - + - @org.onap.aai.annotations.Metadata(description="Operational status of TTP e.g, up,down,testing,preparing-maintenance,maintenance.") + @org.onap.aai.annotations.Metadata(description="Descriptive subtype.") - + - @org.onap.aai.annotations.Metadata(description="Indicate switching capability of TTP e.g,PSC-1, EVPL,L2SC,TDM,OTN.") + @org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details") - + - @org.onap.aai.annotations.Metadata(description="Encoding support by the TTP e.g, packet,ethernet,PDH,SDH,digital-wrapper,lambda,fiber,ODUK,line.") + @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Collection of profiles") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Namespace for common inventory resources.") + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models",requiredProps="model-invariant-id,model-name-version-id,model-type,model-name,model-id,model-version") + + + + - @org.onap.aai.annotations.Metadata(description="Indicate supported protection type of this TTP e.g, unprotected,reroute,reroute-extra,1-for-n,unidir-1-to-1.") + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC") - + - @org.onap.aai.annotations.Metadata(description="correlation between related objects in ETH and OTN topology.") + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC") - + - @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") + @org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.") - + - @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") + @org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.") - + - @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") + @org.onap.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version") - + - @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + @org.onap.aai.annotations.Metadata(description="Version") - + - @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") + @org.onap.aai.annotations.Metadata(description="Description") @@ -11808,19 +11672,160 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + - + - @org.onap.aai.annotations.Metadata(description="Collection of Tunnel Termination Point.") + @org.onap.aai.annotations.Metadata(description="QueryParameters for performing a named-query or model query") - + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="InstanceFilters for performing a named-query or model query") + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="SecondaryFilts for performing a named-query or model query") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query") + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Property holder for query properties or instance properties") + + + + + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Extra properties for inventory item for response list") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Inventory item for response list",container="inventory-response-items") + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Container for inventory items in response list",container="response-list") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Response container for the results of a named-query or model query") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true",requiredProps="vnf-id") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF. This is unique across the graph.") + + + diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v21.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v21.xsd index dd5c869..24880a7 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v21.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v21.xsd @@ -4808,90 +4808,90 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - @org.onap.aai.annotations.Metadata(description="Percentage value of the amount of simultaneous active UEs to the total number of UEs where active means the UEs are exchanging data with the network.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The jitter requirements of network slice.") - - - - - - - @org.onap.aai.annotations.Metadata(description="An attribute specifies the time that an application consuming a communication service may continue without an anticipated message.") - - - - - - - @org.onap.aai.annotations.Metadata(description="This parameter specifies the availability requirement, expressed as a percentage.") - - - - - - - @org.onap.aai.annotations.Metadata(description="An attribute specifies in the context of network layer packet transmissions, percentage value of the amount of sent network layer packets successfully delivered to a given system entity within the time constraint required by the targeted service, divided by the total number of sent network layer packets.") - - - - - - - @org.onap.aai.annotations.Metadata(description="This attribute defines achievable data rate of the network slice in downlink that is available ubiquitously across the coverage area of the slice.") - - - - - - - @org.onap.aai.annotations.Metadata(description="This attribute defines downlink data rate supported by the network slice per UE.") - - - - - - - @org.onap.aai.annotations.Metadata(description="This attribute defines achievable data rate of the network slice in uplink that is available ubiquitously across the coverage area of the slice.") - - - - - - - @org.onap.aai.annotations.Metadata(description="uLThptPerUE Integer 1 This attribute defines uplink data rate supported by the network slice per UE.") - - - - - - - @org.onap.aai.annotations.Metadata(description="This parameter specifies the maximum packet size supported by the network slice.") - - - - - - - @org.onap.aai.annotations.Metadata(description="This parameter defines the maximum number of concurrent sessions supported by the network slice.") - - - - - - - @org.onap.aai.annotations.Metadata(description="An attribute specifies the overall user density over the coverage area of the network slice.") - - - + + + + @org.onap.aai.annotations.Metadata(description="Percentage value of the amount of simultaneous active UEs to the total number of UEs where active means the UEs are exchanging data with the network.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The jitter requirements of network slice.") + + + + + + + @org.onap.aai.annotations.Metadata(description="An attribute specifies the time that an application consuming a communication service may continue without an anticipated message.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This parameter specifies the availability requirement, expressed as a percentage.") + + + + + + + @org.onap.aai.annotations.Metadata(description="An attribute specifies in the context of network layer packet transmissions, percentage value of the amount of sent network layer packets successfully delivered to a given system entity within the time constraint required by the targeted service, divided by the total number of sent network layer packets.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This attribute defines achievable data rate of the network slice in downlink that is available ubiquitously across the coverage area of the slice.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This attribute defines downlink data rate supported by the network slice per UE.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This attribute defines achievable data rate of the network slice in uplink that is available ubiquitously across the coverage area of the slice.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This attribute defines uplink data rate supported by the network slice per UE.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This parameter specifies the maximum packet size supported by the network slice.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This parameter defines the maximum number of concurrent sessions supported by the network slice.") + + + + + + + @org.onap.aai.annotations.Metadata(description="An attribute specifies the overall user density over the coverage area of the network slice.") + + + @@ -4993,83 +4993,83 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - @org.onap.aai.annotations.Metadata(description="An attribute specfies the percentage value of the amount of simultaneous active UEs to the total number of UEs where active means the UEs are exchanging data with the network.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The jitter requirements of network slice subnet.") - - - - - - - @org.onap.aai.annotations.Metadata(description="survivalTime String 1 Survival time for network slice subnet.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Communica¬tion service availability target value.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Maxmun bandwidth value of TN network. ") - - - - - - - @org.onap.aai.annotations.Metadata(description="Expected date rate for uRLLC.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The maximum number of PDU sessions that can simultaneously/concurrently access to the network slice.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Overall User Density.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Communication service reliability mean time between failures.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Message size(byte) .") - - - - - - - @org.onap.aai.annotations.Metadata(description="Target value of transfer interval.") - - - + + + + @org.onap.aai.annotations.Metadata(description="An attribute specfies the percentage value of the amount of simultaneous active UEs to the total number of UEs where active means the UEs are exchanging data with the network.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The jitter requirements of network slice subnet.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Survival time for network slice subnet.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Communication service availability target value.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Maxmun bandwidth value of TN network.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Expected date rate for uRLLC.") + + + + + + + @org.onap.aai.annotations.Metadata(description="maxNumberofPDUSession Integer 1 The maximum number of PDU sessions that can simultaneously/concurrently access to the network slice.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Overall User Density.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Communication service reliability mean time between failures.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Message size(byte) .") + + + + + + + @org.onap.aai.annotations.Metadata(description="transferIntervalTarget String 1 Target value of transfer interval.") + + + @@ -13158,214 +13158,109 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - - @org.onap.aai.annotations.Metadata(description="Namespace for network inventory resources.") - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri") - - - - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV",uniqueProps="aai-uuid",indexedProps="aai-uuid") - - - - - - - - - - - - - - - - - - - - - - - + - @org.onap.aai.annotations.Metadata(description="describes an hardware-catalog-items",indexedProps="item-name",uniqueProps="item-name",container="hardware-catalog-items",namespace="common",uriTemplate="/common/hardware-catalog-items/hardware-catalog-item/{item-name}",requiredProps="item-name,system-type,manufacturer,model,sku") + @org.onap.aai.annotations.Metadata(description="Instance of an label restriction",indexedProps="id,label-start,label-end,range-bitmap,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="label-restrictions",namespace="network",requiredProps="id",uriTemplate="/network/label-restrictions/label-restriction/{id}") - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Unique name for the hardware-catalog-item") + @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the label restriction") - + - @org.onap.aai.annotations.Metadata(description="Type of system defined by ATT") + @org.onap.aai.annotations.Metadata(description="First number in the label range") - + - @org.onap.aai.annotations.Metadata(description="Manufacturer of the hardware-catalog-item (ex,Cisco)") + @org.onap.aai.annotations.Metadata(description="Last number in the label range") - + - @org.onap.aai.annotations.Metadata(description="Model of the hardware-catalog-item (ex,5501 NCS)") + @org.onap.aai.annotations.Metadata(description="Bitmap of available labels starting from label-start to label-end.") - + - @org.onap.aai.annotations.Metadata(description="Part number assigned by the manufacturer") + @org.onap.aai.annotations.Metadata(description="Step of labels in label range.") - + - @org.onap.aai.annotations.Metadata(description="Description of the hardware-catalog-item") + @org.onap.aai.annotations.Metadata(description="Indicate wheather range-bitmap items are inclusive or exclusive.") - + - @org.onap.aai.annotations.Metadata(description="Stock-keeping-unit (ATT specific identifier for the hardware-catalog-item)") + @org.onap.aai.annotations.Metadata(description="Indicate the label range e.g.trib-slot, trib-port") - + - @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + @org.onap.aai.annotations.Metadata(description="Indicate trib slot granularity.") - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Collection of hardware-catalog-items") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Contacts store the vendor information and have a relationship to the generic-vnf. In 1902, this will be populated by SDN-GC",uniqueProps="contact-name",container="contacts",namespace="common",nameProps="contact-name,vendor-type",uriTemplate="/common/contacts/contact/{contact-name}",requiredProps="contact-name") - - - - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Name of the contact") + @org.onap.aai.annotations.Metadata(description="Priority.") - + - @org.onap.aai.annotations.Metadata(description="Tel no. of contact") + @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") - + - @org.onap.aai.annotations.Metadata(description="e-mail of contact") + @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") - + - @org.onap.aai.annotations.Metadata(description="NI (Network Integrator)SI (System Integrator) 3rd Party LCM") + @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") @@ -13380,72 +13275,79 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - @org.onap.aai.annotations.Metadata(description="Collection of contacts") + @org.onap.aai.annotations.Metadata(description="Collection of Label Restriction.") - + - + - @org.onap.aai.annotations.Metadata(description="describes an profiles",indexedProps="profile-name,profile-role,profile-function",uniqueProps="profile-name",nameProps="profile-type",container="profiles",namespace="common",uriTemplate="/common/profiles/profile/{profile-name}",requiredProps="profile-name,profile-type,characteristics") + @org.onap.aai.annotations.Metadata(description="Instance of an User network interface",indexedProps="id,tp-id,cvlan,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="unis",namespace="network",requiredProps="id",uriTemplate="/network/unis/uni/{id}") - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Name of the profile") + @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the UNI") - + - @org.onap.aai.annotations.Metadata(description="Type of profile (ex,network-power-profile)") + @org.onap.aai.annotations.Metadata(description="Termination point ID.") - + - @org.onap.aai.annotations.Metadata(description="Set of characteristics of the profile.") + @org.onap.aai.annotations.Metadata(description="The cvlan for the site used for ethernet type connectivity.") - + - @org.onap.aai.annotations.Metadata(description="Descriptive subtype.") + @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") - + - @org.onap.aai.annotations.Metadata(description="used to categorize this object in conjunction with profile-type and profile-function.") + @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") - + - @org.onap.aai.annotations.Metadata(description="used to categorize this object in conjunction with profile-type and profile-role. The most specific category") + @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") - + - @org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details") + @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") @@ -13457,95 +13359,110 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - + - @org.onap.aai.annotations.Metadata(description="Collection of profiles") + @org.onap.aai.annotations.Metadata(description="Collection of User network interface.") - + - + - @org.onap.aai.annotations.Metadata(description="Port List Range",dependentOn="endpoint,rule,object-group",uriTemplate="/port-list/{port}",requiredProps="port") + @org.onap.aai.annotations.Metadata(description="Instance of an te-link-attribute",indexedProps="id,link-protection-type,access-type,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="te-link-attributes",namespace="network",requiredProps="id",uriTemplate="/network/te-link-attributes/te-link-attribute/{id}") - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Port number") + @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the TE link attribute") - + - @org.onap.aai.annotations.Metadata(description="Name or assignment for the port") + @org.onap.aai.annotations.Metadata(description="Indicate desired protection type of the link e.g, unprotected, shared or 1+1") - + - @org.onap.aai.annotations.Metadata(description="Type or usage of the port") + @org.onap.aai.annotations.Metadata(description="Indicate link access type e.g, point-to-point or multi-access.") - + - @org.onap.aai.annotations.Metadata(description="Operator to apply to the port (greater than, less than, etc).") + @org.onap.aai.annotations.Metadata(description="Bandwidth available on link.") - + - @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + @org.onap.aai.annotations.Metadata(description="The type of ODU e.g, ODU1, ODU2, ODU3, ODU4.") - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Selectors list",dependentOn="rule,object-group,endpoint,policy",uriTemplate="/selector-list/{selector}",requiredProps="selector") - - - - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Selector") + @org.onap.aai.annotations.Metadata(description="The value of available bandwidth.") - + - @org.onap.aai.annotations.Metadata(description="Name or assignment for the selector") + @org.onap.aai.annotations.Metadata(description="Indicate wheather link is abstract or native") - + - @org.onap.aai.annotations.Metadata(description="Type or usage of the selector") + @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") @@ -13560,254 +13477,374 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - @org.onap.aai.annotations.Metadata(description="describes an rules",container="rules",dependentOn="policy",uriTemplate="/rules/rule/{rule-id}",requiredProps="rule-id,log") + @org.onap.aai.annotations.Metadata(description="Collection of TE link attributes.") - + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Instance of an inter layer topology attachment",indexedProps="id,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="interlayer-attachments",namespace="network",requiredProps="id",uriTemplate="/network/interlayer-attachments/interlayer-attachment/{id}") + + + + - @org.onap.aai.annotations.Metadata(isKey=true,description="UUID.") + @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the interlayer topology attachment") - + - @org.onap.aai.annotations.Metadata(description="ingress or egress") + @org.onap.aai.annotations.Metadata(description="Inter layer lock id") - + - @org.onap.aai.annotations.Metadata(description="Positive protocol match. tcp, udp, icmpv6, sctp, udplite, integer 1-255.") + @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") - + - @org.onap.aai.annotations.Metadata(description="Negative protocol match. tcp, udp, icmpv6, sctp, udplite, integer 1-255.") + @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") - + - @org.onap.aai.annotations.Metadata(description="Action to perform when matching this rule.") + @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") - + - @org.onap.aai.annotations.Metadata(description="") + @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") - + - @org.onap.aai.annotations.Metadata(description="") + @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Collection of interlayer topology connectivities.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Instance of an tunnel termination point",indexedProps="ttp-id,tunnel-tp-id,name,operational-status,model-invariant-id,model-version-id",searchable="ttp-id",uniqueProps="ttp-id",container="tunnel-termination-points",namespace="network",requiredProps="ttp-id",uriTemplate="/network/tunnel-termination-points/tunnel-termination-point/{ttp-id}") + + + + - @org.onap.aai.annotations.Metadata(description="Sequence number of the rule.") + @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the tunnel termination point") - + - @org.onap.aai.annotations.Metadata(description="Threshold") + @org.onap.aai.annotations.Metadata(description="TTP ID discovered from controller") - + - @org.onap.aai.annotations.Metadata(description="status") + @org.onap.aai.annotations.Metadata(description="Name of tunnel termination point") - - - - @org.onap.aai.annotations.Metadata(description="Version") - - - - - - - @org.onap.aai.annotations.Metadata(description="Named variable used for counting transactions.") - - - - + - @org.onap.aai.annotations.Metadata(defaultValue="false",description="Boolean to indicate whether or not logging is required.") + @org.onap.aai.annotations.Metadata(description="Admin status of TTP e.g, up,down,testing,preparing-maintenance,maintenance.") - + - @org.onap.aai.annotations.Metadata(description="Description.") + @org.onap.aai.annotations.Metadata(description="Operational status of TTP e.g, up,down,testing,preparing-maintenance,maintenance.") - + - @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + @org.onap.aai.annotations.Metadata(description="Indicate switching capability of TTP e.g,PSC-1, EVPL,L2SC,TDM,OTN.") - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Collection of rules") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Definition of policy",indexedProps="policy-id",uniqueProps="policy-id",container="policies",namespace="common",uriTemplate="/common/policies/policy/{policy-id}",requiredProps="policy-id,do-not-track,pre-dnat,apply-on-forward") - - - - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Unique Policy UUID.") + @org.onap.aai.annotations.Metadata(description="Encoding support by the TTP e.g, packet,ethernet,PDH,SDH,digital-wrapper,lambda,fiber,ODUK,line.") - + - @org.onap.aai.annotations.Metadata(description="Policy Name") + @org.onap.aai.annotations.Metadata(description="Indicate supported protection type of this TTP e.g, unprotected,reroute,reroute-extra,1-for-n,unidir-1-to-1.") - + - @org.onap.aai.annotations.Metadata(description="Policy Type") + @org.onap.aai.annotations.Metadata(description="correlation between related objects in ETH and OTN topology.") - + - @org.onap.aai.annotations.Metadata(description="Policy role") + @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") - + - @org.onap.aai.annotations.Metadata(description="policy function") + @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") - + - @org.onap.aai.annotations.Metadata(defaultValue="false",description="Do not track") + @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") - + - @org.onap.aai.annotations.Metadata(defaultValue="false",description="Pre destination NAT") + @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") - + - @org.onap.aai.annotations.Metadata(defaultValue="false",description="apply on forward") + @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") - + - @org.onap.aai.annotations.Metadata(description="Host and Interface Type Selector",dbAlias="selector-local") + @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Collection of Tunnel Termination Point.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Namespace for network inventory resources.") + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri") + + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV",uniqueProps="aai-uuid",indexedProps="aai-uuid") + + + + + + + + + + + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="describes an hardware-catalog-items",indexedProps="item-name",uniqueProps="item-name",container="hardware-catalog-items",namespace="common",uriTemplate="/common/hardware-catalog-items/hardware-catalog-item/{item-name}",requiredProps="item-name,system-type,manufacturer,model,sku") + + + + - @org.onap.aai.annotations.Metadata(description="Order") + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique name for the hardware-catalog-item") - + - @org.onap.aai.annotations.Metadata(description="Version") + @org.onap.aai.annotations.Metadata(description="Type of system defined by ATT") - + - @org.onap.aai.annotations.Metadata(description="Status") + @org.onap.aai.annotations.Metadata(description="Manufacturer of the hardware-catalog-item (ex,Cisco)") - + - @org.onap.aai.annotations.Metadata(description="Remote ASN") + @org.onap.aai.annotations.Metadata(description="Model of the hardware-catalog-item (ex,5501 NCS)") - + - @org.onap.aai.annotations.Metadata(description="Namespace filter to apply the policy") + @org.onap.aai.annotations.Metadata(description="Part number assigned by the manufacturer") - + - @org.onap.aai.annotations.Metadata(description="Description of the policy") + @org.onap.aai.annotations.Metadata(description="Description of the hardware-catalog-item") - + - @org.onap.aai.annotations.Metadata(description="Set of rule variables") + @org.onap.aai.annotations.Metadata(description="Stock-keeping-unit (ATT specific identifier for the hardware-catalog-item)") @@ -13818,59 +13855,55 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - + + + + @org.onap.aai.annotations.Metadata(description="Collection of hardware-catalog-items") + + - + - + - @org.onap.aai.annotations.Metadata(description="describes an vlan characteristic",indexedProps="vlan-characteristic-id",container="vlan-characteristics",namespace="common",uriTemplate="/common/vlan-characteristics/vlan-characteristic/{vlan-characteristic-id}",requiredProps="vlan-characteristic-id,dhcp-pool,internet-access") + @org.onap.aai.annotations.Metadata(description="Contacts store the vendor information and have a relationship to the generic-vnf. In 1902, this will be populated by SDN-GC",uniqueProps="contact-name",container="contacts",namespace="common",nameProps="contact-name,vendor-type",uriTemplate="/common/contacts/contact/{contact-name}",requiredProps="contact-name") - + - @org.onap.aai.annotations.Metadata(isKey=true,description="UUID.") + @org.onap.aai.annotations.Metadata(isKey=true,description="Name of the contact") - + - @org.onap.aai.annotations.Metadata(description="Name.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Device role the vlan-characteristic applies to (c-agg-leaf-a, c-agg-leaf-b, r-leaf).") + @org.onap.aai.annotations.Metadata(description="Tel no. of contact") - + - @org.onap.aai.annotations.Metadata(defaultValue="false",description="DHCP Agent access.") + @org.onap.aai.annotations.Metadata(description="e-mail of contact") - + - @org.onap.aai.annotations.Metadata(defaultValue="false",description="Boolean to represent if requires internet access.") + @org.onap.aai.annotations.Metadata(description="NI (Network Integrator)SI (System Integrator) 3rd Party LCM") @@ -13885,51 +13918,72 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - @org.onap.aai.annotations.Metadata(description="Collection of vlan characteristics") + @org.onap.aai.annotations.Metadata(description="Collection of contacts") - + - + - @org.onap.aai.annotations.Metadata(description="describes an relationship component",indexedProps="rule-node,rule-property,rule-value,component-order",container="relationship-components",dependentOn="relationship-rule",uriTemplate="common/relationship-components/relationship-component/{rule-node}",requiredProps="rule-node,rule-property,rule-value,component-order") + @org.onap.aai.annotations.Metadata(description="describes an profiles",indexedProps="profile-name,profile-role,profile-function",uniqueProps="profile-name",nameProps="profile-type",container="profiles",namespace="common",uriTemplate="/common/profiles/profile/{profile-name}",requiredProps="profile-name,profile-type,characteristics") - + - @org.onap.aai.annotations.Metadata(isKey=true,description="NARAD object") + @org.onap.aai.annotations.Metadata(isKey=true,description="Name of the profile") - + - @org.onap.aai.annotations.Metadata(description="Object property") + @org.onap.aai.annotations.Metadata(description="Type of profile (ex,network-power-profile)") - + - @org.onap.aai.annotations.Metadata(description="Property value") + @org.onap.aai.annotations.Metadata(description="Set of characteristics of the profile.") - + - @org.onap.aai.annotations.Metadata(description="Order in traversal") + @org.onap.aai.annotations.Metadata(description="Descriptive subtype.") + + + + + + + @org.onap.aai.annotations.Metadata(description="used to categorize this object in conjunction with profile-type and profile-function.") + + + + + + + @org.onap.aai.annotations.Metadata(description="used to categorize this object in conjunction with profile-type and profile-role. The most specific category") + + + + + + + @org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details") @@ -13941,54 +13995,55 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + - + - @org.onap.aai.annotations.Metadata(description="Collection of relationship components") + @org.onap.aai.annotations.Metadata(description="Collection of profiles") - + - + - @org.onap.aai.annotations.Metadata(description="describes an relationship rule",indexedProps="rule-id,context,rule-traversals,applies-to",uniqueProps="rule-id",container="relationship-rules",namespace="common",uriTemplate="/common/relationship-rules/relationship-rule/{rule-id}",requiredProps="rule-id,context,rule-traversals,applies-to") + @org.onap.aai.annotations.Metadata(description="Port List Range",dependentOn="endpoint,rule,object-group",uriTemplate="/port-list/{port}",requiredProps="port") - + - @org.onap.aai.annotations.Metadata(isKey=true,description="UUID.") + @org.onap.aai.annotations.Metadata(isKey=true,description="Port number") - + - @org.onap.aai.annotations.Metadata(description="Example global,site") + @org.onap.aai.annotations.Metadata(description="Name or assignment for the port") - + - @org.onap.aai.annotations.Metadata(description="Number of traversals") + @org.onap.aai.annotations.Metadata(description="Type or usage of the port") - + - @org.onap.aai.annotations.Metadata(description="Node the related object applies to") + @org.onap.aai.annotations.Metadata(description="Operator to apply to the port (greater than, less than, etc).") @@ -13999,121 +14054,153 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - - - @org.onap.aai.annotations.Metadata(description="Collection of relationship rules") - - - - - - - - + - @org.onap.aai.annotations.Metadata(description="Namespace for common inventory resources.") + @org.onap.aai.annotations.Metadata(description="Selectors list",dependentOn="rule,object-group,endpoint,policy",uriTemplate="/selector-list/{selector}",requiredProps="selector") - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Selector") + + + + + + + @org.onap.aai.annotations.Metadata(description="Name or assignment for the selector") + + + + + + + @org.onap.aai.annotations.Metadata(description="Type or usage of the selector") + + + + + + + @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + + + + - + - @org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models",requiredProps="model-invariant-id,model-name-version-id,model-type,model-name,model-id,model-version") + @org.onap.aai.annotations.Metadata(description="describes an rules",container="rules",dependentOn="policy",uriTemplate="/rules/rule/{rule-id}",requiredProps="rule-id,log") - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC") + @org.onap.aai.annotations.Metadata(isKey=true,description="UUID.") - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC") + @org.onap.aai.annotations.Metadata(description="ingress or egress") - + - @org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.") + @org.onap.aai.annotations.Metadata(description="Positive protocol match. tcp, udp, icmpv6, sctp, udplite, integer 1-255.") - + - @org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.") + @org.onap.aai.annotations.Metadata(description="Negative protocol match. tcp, udp, icmpv6, sctp, udplite, integer 1-255.") - + - @org.onap.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version") + @org.onap.aai.annotations.Metadata(description="Action to perform when matching this rule.") - + + + + @org.onap.aai.annotations.Metadata(description="") + + + + + + + @org.onap.aai.annotations.Metadata(description="") + + + + + + + @org.onap.aai.annotations.Metadata(description="Sequence number of the rule.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Threshold") + + + + + + + @org.onap.aai.annotations.Metadata(description="status") + + + + @org.onap.aai.annotations.Metadata(description="Version") - + - @org.onap.aai.annotations.Metadata(description="Description") + @org.onap.aai.annotations.Metadata(description="Named variable used for counting transactions.") + + + + + + + @org.onap.aai.annotations.Metadata(defaultValue="false",description="Boolean to indicate whether or not logging is required.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Description.") @@ -14124,297 +14211,141 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + + - + - @org.onap.aai.annotations.Metadata(description="QueryParameters for performing a named-query or model query") + @org.onap.aai.annotations.Metadata(description="Collection of rules") - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="InstanceFilters for performing a named-query or model query") - - - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="SecondaryFilts for performing a named-query or model query") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query") - - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Property holder for query properties or instance properties") - - - - - - - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Extra properties for inventory item for response list") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Inventory item for response list",container="inventory-response-items") - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Container for inventory items in response list",container="response-list") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Response container for the results of a named-query or model query") - - - - + - + - @org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true",requiredProps="vnf-id") + @org.onap.aai.annotations.Metadata(description="Definition of policy",indexedProps="policy-id",uniqueProps="policy-id",container="policies",namespace="common",uriTemplate="/common/policies/policy/{policy-id}",requiredProps="policy-id,do-not-track,pre-dnat,apply-on-forward") - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF. This is unique across the graph.") + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique Policy UUID.") - - - - - - - - @org.onap.aai.annotations.Metadata(description="Instance of an User network interface",indexedProps="id,tp-id,cvlan,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="unis",namespace="network",requiredProps="id",uriTemplate="/network/unis/uni/{id}") - - - - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the UNI") + @org.onap.aai.annotations.Metadata(description="Policy Name") - + - @org.onap.aai.annotations.Metadata(description="Termination point ID.") + @org.onap.aai.annotations.Metadata(description="Policy Type") - + - @org.onap.aai.annotations.Metadata(description="The cvlan for the site used for ethernet type connectivity.") + @org.onap.aai.annotations.Metadata(description="Policy role") - + - @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") + @org.onap.aai.annotations.Metadata(description="policy function") - + - @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") + @org.onap.aai.annotations.Metadata(defaultValue="false",description="Do not track") - + - @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") + @org.onap.aai.annotations.Metadata(defaultValue="false",description="Pre destination NAT") - + - @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + @org.onap.aai.annotations.Metadata(defaultValue="false",description="apply on forward") - + - @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") + @org.onap.aai.annotations.Metadata(description="Host and Interface Type Selector",dbAlias="selector-local") - + - @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + @org.onap.aai.annotations.Metadata(description="Order") - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Collection of User network interface.") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Instance of an inter layer topology attachment",indexedProps="id,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="interlayer-attachments",namespace="network",requiredProps="id",uriTemplate="/network/interlayer-attachments/interlayer-attachment/{id}") - - - - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the interlayer topology attachment") + @org.onap.aai.annotations.Metadata(description="Version") - + - @org.onap.aai.annotations.Metadata(description="Inter layer lock id") + @org.onap.aai.annotations.Metadata(description="Status") - + - @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") + @org.onap.aai.annotations.Metadata(description="Remote ASN") - + - @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") + @org.onap.aai.annotations.Metadata(description="Namespace filter to apply the policy") - + - @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + @org.onap.aai.annotations.Metadata(description="Description of the policy") - + - @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") + @org.onap.aai.annotations.Metadata(description="Set of rule variables") @@ -14425,111 +14356,59 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + - + - - - @org.onap.aai.annotations.Metadata(description="Collection of interlayer topology connectivities.") - - - + - + - @org.onap.aai.annotations.Metadata(description="Instance of an te-link-attribute",indexedProps="id,link-protection-type,access-type,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="te-link-attributes",namespace="network",requiredProps="id",uriTemplate="/network/te-link-attributes/te-link-attribute/{id}") + @org.onap.aai.annotations.Metadata(description="describes an vlan characteristic",indexedProps="vlan-characteristic-id",container="vlan-characteristics",namespace="common",uriTemplate="/common/vlan-characteristics/vlan-characteristic/{vlan-characteristic-id}",requiredProps="vlan-characteristic-id,dhcp-pool,internet-access") - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the TE link attribute") + @org.onap.aai.annotations.Metadata(isKey=true,description="UUID.") - + - @org.onap.aai.annotations.Metadata(description="Indicate desired protection type of the link e.g, unprotected, shared or 1+1") + @org.onap.aai.annotations.Metadata(description="Name.") - + - @org.onap.aai.annotations.Metadata(description="Indicate link access type e.g, point-to-point or multi-access.") + @org.onap.aai.annotations.Metadata(description="Device role the vlan-characteristic applies to (c-agg-leaf-a, c-agg-leaf-b, r-leaf).") - + - @org.onap.aai.annotations.Metadata(description="Bandwidth available on link.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The type of ODU e.g, ODU1, ODU2, ODU3, ODU4.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The value of available bandwidth.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Indicate wheather link is abstract or native") - - - - - - - @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") - - - - - - - @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + @org.onap.aai.annotations.Metadata(defaultValue="false",description="DHCP Agent access.") - + - @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") + @org.onap.aai.annotations.Metadata(defaultValue="false",description="Boolean to represent if requires internet access.") @@ -14544,121 +14423,51 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - @org.onap.aai.annotations.Metadata(description="Collection of TE link attributes.") + @org.onap.aai.annotations.Metadata(description="Collection of vlan characteristics") - + - + - @org.onap.aai.annotations.Metadata(description="Instance of an label restriction",indexedProps="id,label-start,label-end,range-bitmap,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="label-restrictions",namespace="network",requiredProps="id",uriTemplate="/network/label-restrictions/label-restriction/{id}") + @org.onap.aai.annotations.Metadata(description="describes an relationship component",indexedProps="rule-node,rule-property,rule-value,component-order",container="relationship-components",dependentOn="relationship-rule",uriTemplate="common/relationship-components/relationship-component/{rule-node}",requiredProps="rule-node,rule-property,rule-value,component-order") - - - - @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the label restriction") - - - - - - - @org.onap.aai.annotations.Metadata(description="First number in the label range") - - - - - - - @org.onap.aai.annotations.Metadata(description="Last number in the label range") - - - - - - - @org.onap.aai.annotations.Metadata(description="Bitmap of available labels starting from label-start to label-end.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Step of labels in label range.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Indicate wheather range-bitmap items are inclusive or exclusive.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Indicate the label range e.g.trib-slot, trib-port") - - - - - - - @org.onap.aai.annotations.Metadata(description="Indicate trib slot granularity.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Priority.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") - - - - + - @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") + @org.onap.aai.annotations.Metadata(isKey=true,description="NARAD object") - + - @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") + @org.onap.aai.annotations.Metadata(description="Object property") - + - @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + @org.onap.aai.annotations.Metadata(description="Property value") - + - @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") + @org.onap.aai.annotations.Metadata(description="Order in traversal") @@ -14673,121 +14482,176 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - @org.onap.aai.annotations.Metadata(description="Collection of Label Restriction.") + @org.onap.aai.annotations.Metadata(description="Collection of relationship components") - + - + - @org.onap.aai.annotations.Metadata(description="Instance of an tunnel termination point",indexedProps="ttp-id,tunnel-tp-id,name,operational-status,model-invariant-id,model-version-id",searchable="ttp-id",uniqueProps="ttp-id",container="tunnel-termination-points",namespace="network",requiredProps="ttp-id",uriTemplate="/network/tunnel-termination-points/tunnel-termination-point/{ttp-id}") + @org.onap.aai.annotations.Metadata(description="describes an relationship rule",indexedProps="rule-id,context,rule-traversals,applies-to",uniqueProps="rule-id",container="relationship-rules",namespace="common",uriTemplate="/common/relationship-rules/relationship-rule/{rule-id}",requiredProps="rule-id,context,rule-traversals,applies-to") - - - - @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the tunnel termination point") - - - - - - - @org.onap.aai.annotations.Metadata(description="TTP ID discovered from controller") - - - - + - @org.onap.aai.annotations.Metadata(description="Name of tunnel termination point") + @org.onap.aai.annotations.Metadata(isKey=true,description="UUID.") - + - @org.onap.aai.annotations.Metadata(description="Admin status of TTP e.g, up,down,testing,preparing-maintenance,maintenance.") + @org.onap.aai.annotations.Metadata(description="Example global,site") - + - @org.onap.aai.annotations.Metadata(description="Operational status of TTP e.g, up,down,testing,preparing-maintenance,maintenance.") + @org.onap.aai.annotations.Metadata(description="Number of traversals") - + - @org.onap.aai.annotations.Metadata(description="Indicate switching capability of TTP e.g,PSC-1, EVPL,L2SC,TDM,OTN.") + @org.onap.aai.annotations.Metadata(description="Node the related object applies to") - + - @org.onap.aai.annotations.Metadata(description="Encoding support by the TTP e.g, packet,ethernet,PDH,SDH,digital-wrapper,lambda,fiber,ODUK,line.") + @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Collection of relationship rules") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Namespace for common inventory resources.") + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models",requiredProps="model-invariant-id,model-name-version-id,model-type,model-name,model-id,model-version") + + + + - @org.onap.aai.annotations.Metadata(description="Indicate supported protection type of this TTP e.g, unprotected,reroute,reroute-extra,1-for-n,unidir-1-to-1.") + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC") - + - @org.onap.aai.annotations.Metadata(description="correlation between related objects in ETH and OTN topology.") + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC") - + - @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") + @org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.") - + - @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") + @org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.") - + - @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") + @org.onap.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version") - + - @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + @org.onap.aai.annotations.Metadata(description="Version") - + - @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") + @org.onap.aai.annotations.Metadata(description="Description") @@ -14798,19 +14662,160 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + - + - @org.onap.aai.annotations.Metadata(description="Collection of Tunnel Termination Point.") + @org.onap.aai.annotations.Metadata(description="QueryParameters for performing a named-query or model query") - + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="InstanceFilters for performing a named-query or model query") + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="SecondaryFilts for performing a named-query or model query") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query") + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Property holder for query properties or instance properties") + + + + + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Extra properties for inventory item for response list") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Inventory item for response list",container="inventory-response-items") + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Container for inventory items in response list",container="response-list") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Response container for the results of a named-query or model query") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true",requiredProps="vnf-id") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF. This is unique across the graph.") + + + diff --git a/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml b/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml index 15433a3..41a7e72 100644 --- a/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml +++ b/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml @@ -3595,6 +3595,11 @@ + + + + + diff --git a/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml b/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml index fbd604d..716b98b 100644 --- a/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml +++ b/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml @@ -4175,6 +4175,11 @@ + + + + + diff --git a/pom.xml b/pom.xml index 54b73d6..6ac6138 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ org.onap.aai.schema-service schema-service - 1.7.10-SNAPSHOT + 1.7.11-SNAPSHOT aai-schema-service pom