From c87f766c7a5457472fd30e0f4440d935099d80cb Mon Sep 17 00:00:00 2001 From: "vani.kv" Date: Mon, 24 Jun 2024 16:59:17 +0530 Subject: [AAI] v29 new schema addition for 3GPP RAN Network - New service-instance attributes added in AAI schema - New slice-profile attributes added in AAI schema - New Feasibility Check Job attributes added in AAI schema - Added New Objects - Delay Tolerance, KPI Monitoring, Xl-Thpt, Term Density, Synchronicity, Deterministic-Comm, ServAttrCom for slice profile - Added new Edge Rule for feasibility-check-job, slice-profile and the newly added objects Issue-ID: AAI-3881 Change-Id: I1b5e47965c69725d26fe0518da725b66a10825bc Signed-off-by: vani.kv --- .../resources/onap/aai_schema/aai_schema_v29.xsd | 1155 +++++++++++++++++++- .../onap/dbedgerules/v29/DbEdgeRules_v29.json | 307 +++++- .../main/resources/onap/oxm/v29/aai_oxm_v29.xml | 1062 ++++++++++++++++-- 3 files changed, 2433 insertions(+), 91 deletions(-) (limited to 'aai-schema/src/main/resources') diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v29.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v29.xsd index a0dc0dd..12e3423 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v29.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v29.xsd @@ -7595,11 +7595,957 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + + @org.onap.aai.annotations.Metadata(description="ServAttrCom info of slice profile",indexedProps="serv-attr-com-id,data-owner,data-source,data-source-version",uniqueProps="serv-attr-com-id",container="serv-attr-coms",uriTemplate="/serv-attr-coms/serv-attr-com/{serv-attr-com-id}",requiredProps="serv-attr-com-id") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This attribute Represents the category - CHARACTER, SCALABILITY.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Represents the exposure - This attribute specifies exposure mode of a service requirement/attribute of GST.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Represents the tagging- PERFORMANCE, FUNCTION, OPERATION.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the entity that is responsible managing this inventory object.",ownerCheck="N/A") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the upstream source of the data.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the version of the upstream source.") + + + + + + + @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 ServAttrCom object.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="dl-thpt-per-slice-subnet value info of slice profile",indexedProps="xl-thpt-id,data-owner,data-source,data-source-version",uniqueProps="xl-thpt-id",container="dl-thpt-per-slice-subnets",uriTemplate="/dl-thpt-per-slice-subnets/dl-thpt-per-slice-subnet/{xl-thpt-id}",requiredProps="xl-thpt-id") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Represents the common properties of service requirement related attributes.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This attribute describes the guaranteed data rate.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This attribute describes the maximum data rate.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the entity that is responsible managing this inventory object.",ownerCheck="N/A") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the upstream source of the data.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the version of the upstream source.") + + + + + + + @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 Dl Throughput per slice subnet object.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="ul-thpt-per-slice-subnet value info of slice profile",indexedProps="xl-thpt-id,data-owner,data-source,data-source-version",uniqueProps="xl-thpt-id",container="ul-thpt-per-slice-subnets",uriTemplate="/ul-thpt-per-slice-subnets/ul-thpt-per-slice-subnet/{xl-thpt-id}",requiredProps="xl-thpt-id") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Represents the common properties of service requirement related attributes.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This attribute describes the guaranteed data rate.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This attribute describes the maximum data rate.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the entity that is responsible managing this inventory object.",ownerCheck="N/A") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the upstream source of the data.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the version of the upstream source.") + + + + + + + @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 Ul Throughput per slice subnet object.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="dl-thpt-per-ue value info of slice profile",indexedProps="xl-thpt-id,data-owner,data-source,data-source-version",uniqueProps="xl-thpt-id",container="dl-thpt-per-ues",uriTemplate="/dl-thpt-per-ues/dl-thpt-per-ue/{xl-thpt-id}",requiredProps="xl-thpt-id") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Represents the common properties of service requirement related attributes.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This attribute describes the guaranteed data rate.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This attribute describes the maximum data rate.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the entity that is responsible managing this inventory object.",ownerCheck="N/A") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the upstream source of the data.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the version of the upstream source.") + + + + + + + @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 DL Throughput per UE.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="ul-thpt-per-ue value info of slice profile",indexedProps="xl-thpt-id,data-owner,data-source,data-source-version",uniqueProps="xl-thpt-id",container="ul-thpt-per-ues",uriTemplate="/ul-thpt-per-ues/ul-thpt-per-ue/{xl-thpt-id}",requiredProps="xl-thpt-id") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Represents the common properties of service requirement related attributes.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This attribute describes the guaranteed data rate.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This attribute describes the maximum data rate.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the entity that is responsible managing this inventory object.",ownerCheck="N/A") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the upstream source of the data.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the version of the upstream source.") + + + + + + + @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 UL Throughput per UE.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Delay Tolerance info of slice profile",indexedProps="delay-tolerance-id,data-owner,data-source,data-source-version",uniqueProps="delay-tolerance-id",container="delay-tolerances",uriTemplate="/delay-tolerances/delay-tolerance/{delay-tolerance-id}",requiredProps="delay-tolerance-id") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Represents the common properties of service requirement related attributes.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This attribute specifies Specifies whether or not the network slice supports service delivery flexibility, especially for the vertical services that are not chasing a high system performance.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the entity that is responsible managing this inventory object.",ownerCheck="N/A") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the upstream source of the data.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the version of the upstream source.") + + + + + + + @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 DelayTolerance object.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Positioning info of slice profile",indexedProps="positioning-id,data-owner,data-source,data-source-version",uniqueProps="positioning-id",container="positionings",uriTemplate="/positionings/positioning/{positioning-id}",requiredProps="positioning-id") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Represents the common properties of service requirement related attributes.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Specifies if this attribute is provided by the RAN domain of the network slice and contains a list of positioning methods provided by the RAN domain - CIDE_CID,OTDOA,RF_FINGERPRINTING,AECID,HYBRID_POSITIONING,NET_RTK.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Specifies how often location information is provided. This parameter simply defines how often the customer is allowed to request location information.Values-PERSEC,PERMIN,PERHOUR") + + + + + + + @org.onap.aai.annotations.Metadata(description="Specifies the accuracy of the location information. Accuracy depends on the respective positioning solution applied in the RAN domain of the network slice, measurement unit is meter") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the entity that is responsible managing this inventory object.",ownerCheck="N/A") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the upstream source of the data.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the version of the upstream source.") + + + + + + + @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 Positioning object.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Term Density info of slice profile",indexedProps="term-density-id,data-owner,data-source,data-source-version",uniqueProps="term-density-id",container="term-densities",uriTemplate="/term-densities/term-density/{term-density-id}",requiredProps="term-density-id") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Represents the common properties of service requirement related attributes.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Specifies the overall user density over the coverage area of the network slice.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the entity that is responsible managing this inventory object.",ownerCheck="N/A") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the upstream source of the data.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the version of the upstream source.") + + + + + + + @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 TermDensities object.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Synchronicity info of slice profile",indexedProps="synchronicity-id,data-owner,data-source,data-source-version",uniqueProps="synchronicity-id",container="synchronicities",uriTemplate="/synchronicities/synchronicity/{synchronicity-id}",requiredProps="synchronicity-id") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Represents the common properties of service requirement related attributes.") + + + + + + + @org.onap.aai.annotations.Metadata(description="NOT_SUPPORTED, BETWEEN_BS_AND_UE, BETWEEN_BS_AND_UE_AND_UE_AND_UE.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Specifies the accuracy of the synchronicity") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the entity that is responsible managing this inventory object.",ownerCheck="N/A") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the upstream source of the data.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the version of the upstream source.") + + + + + + + @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 synchronicity object.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="kpi-monitoring value info of slice profile",indexedProps="kpi-monitoring-id,data-owner,data-source,data-source-version",uniqueProps="kpi-monitoring-id",container="kpi-monitorings",uriTemplate="/kpi-monitorings/kpi-monitoring/{kpi-monitoring-id}",requiredProps="kpi-monitoring-id") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Represents the common properties of service requirement related attributes.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Specifies the name list of KQIs and KPIs available for performance monitoring.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the entity that is responsible managing this inventory object.",ownerCheck="N/A") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the upstream source of the data.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the version of the upstream source.") + + + + + + + @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 kpi-monitoring object.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="downlink deterministic comm value info of slice profile",indexedProps="deterministic-comm-id,data-owner,data-source,data-source-version",uniqueProps="deterministic-comm-id",container="dl-deterministic-comms",uriTemplate="/dl-deterministic-comms/dl-deterministic-comm/{deterministic-comm-id}",requiredProps="deterministic-comm-id") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Represents the common properties of service requirement related attributes.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This parameter describes if the network slice supports deterministic communication,values:NOT_SUPPORTED,SUPPORTED") + + + + + + + @org.onap.aai.annotations.Metadata(description="Specifies a list of periodicities supported by the network slice for deterministic communication. Each instance of periodicity is expressed in seconds.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the entity that is responsible managing this inventory object.",ownerCheck="N/A") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the upstream source of the data.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the version of the upstream source.") + + + + + + + @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 downlink deterministic-comms object.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="uplink deterministic comm value info of slice profile",indexedProps="deterministic-comm-id,data-owner,data-source,data-source-version",uniqueProps="deterministic-comm-id",container="ul-deterministic-comms",uriTemplate="/ul-deterministic-comms/ul-deterministic-comm/{deterministic-comm-id}",requiredProps="deterministic-comm-id") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Represents the common properties of service requirement related attributes.") + + + + + + + @org.onap.aai.annotations.Metadata(description="This parameter describes if the network slice supports deterministic communication,values:NOT_SUPPORTED,SUPPORTED") + + + + + + + @org.onap.aai.annotations.Metadata(description="Specifies a list of periodicities supported by the network slice for deterministic communication. Each instance of periodicity is expressed in seconds.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the entity that is responsible managing this inventory object.",ownerCheck="N/A") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the upstream source of the data.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identifies the version of the upstream source.") + + + + + + + @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 uplink deterministic-comms object.") + + + + + + + - @org.onap.aai.annotations.Metadata(description="Requirement of network slice subnet service.",uniqueProps="profile-id",indexedProps="profile-id,data-owner,data-source,data-source-version",container="slice-profiles",dependentOn="service-instance",uriTemplate="/service-instances/service-instance/{service-instance-id}/slice-profiles/slice-profile/{profile-id}",searcheable="profile-id") + @org.onap.aai.annotations.Metadata(description="Requirement of network slice subnet service.",uniqueProps="profile-id",indexedProps="profile-id,slice-profile-id,dl-latency,ul-latency,ue-mobility-level,resource-sharing-level,max-number-of-UEs,activity-factor,dl-max-pkt-size,ul-max-pkt-size,ue-speed,dl-reliability,ul-reliability,slice-simultaneous-use,energy-efficiency,survival-time,availability,max-dl-data-volume,max-ul-data-volume,coverage-area,data-owner,data-source,data-source-version",container="slice-profiles",dependentOn="service-instance",uriTemplate="/service-instances/service-instance/{service-instance-id}/slice-profiles/slice-profile/{profile-id}",searcheable="profile-id") @@ -7708,34 +8654,132 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @org.onap.aai.annotations.Metadata(description="This attribute defines required data rate of the network slice subnet in downlink that should be available ubiquitously across the coverage area of the slice.") - + @org.onap.aai.annotations.Metadata(description="This attribute defines required data rate of the network slice subnet in uplink that should be available ubiquitously across the coverage area of the slice.") - + @org.onap.aai.annotations.Metadata(description="This attribute defines data rate supported by the network slice per UE.") - + @org.onap.aai.annotations.Metadata(description="This attribute defines data rate supported by the network slice per UE.") + + + + @org.onap.aai.annotations.Metadata(description="Specifies the maximum packet size supported by the network slice or the network slice subnet in downlink.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Represents which 5G NR frequency bands can be used to access the network slice.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Specifies the maximum packet size supported by the network slice or the network slice subnet in uplink.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Specifies the maximum speed (in km/hour) supported by the network slice or network slice subnet at which a defined QoS can be achieved.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Specifies in the context of network layer DL 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="Specifies in the context of network layer UL 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="Specifies the properties of service delivery flexibility, especially for the vertical services that are not chasing a high system performance.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Specifies whether the RAN domain of the network slice provides geo-localization methods or supporting methods.") + + + + + + + @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="Describes whether a network slice can be simultaneously used by a device together with other classes of network slices.Allowed values are 0,1,2,3,4") + + + + + + + @org.onap.aai.annotations.Metadata(description="Describes the energy efficiency through RAN domain of the network slice i.e. the ratio between the performance and the energy consumption (EC) when assessed during the same time frame.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Specifies the required communication service availability (percentage) through the RAN domain of a network slice. ie,RAN slice subnet.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Specifies the maximum DL PDCP data volume supported by the network slice instance.The unit is MByte/day.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Specifies the maximum UL PDCP data volume supported by the network slice instance.The unit is MByte/day.") + + + @@ -7757,6 +8801,34 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + @org.onap.aai.annotations.Metadata(description="Specifies whether synchronicity of communication devices is supported in the RAN domain, Two cases are most important in this context-Synchronicity between a base station and a mobile device,Synchronicity between mobile devices.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Specifies the name list of KPIs, related to the RAN domain network slice subnet, available for performance monitoring.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Specifies the properties of the deterministic communication in downlink for periodic user traffic.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Specifies the properties of the deterministic communication in uplink for periodic user traffic.") + + + @@ -7861,7 +8933,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context,data-owner,data-source,data-source-version",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name,operational-status",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}",requiredProps="service-instance-id") + @org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context,operational-status,administrative-state,priority-label,data-owner,data-source,data-source-version",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name,operational-status",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}",requiredProps="service-instance-id") @@ -8110,6 +9182,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + @org.onap.aai.annotations.Metadata(description="It indicates the administrative state of the network slice or network slice subnet. Allowed value are LOCKED,UNLOCKED,SHUTTINGDOWN.",suggestibleOnSearch="true") + + + + + + + @org.onap.aai.annotations.Metadata(description="An attribute specifies a label that consumer would assign a value on an instance of network slice subnet.") + + + @@ -8220,6 +9306,34 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + @org.onap.aai.annotations.Metadata(description="An attribute represents MnS consumer's requirements for resource reservation.") + + + + + + + @org.onap.aai.annotations.Metadata(description="An attribute to Indicate the time when the job is created.") + + + + + + + @org.onap.aai.annotations.Metadata(description="An attribute represents MnS consumer's request for recommended network slice related requirements..") + + + + + + + @org.onap.aai.annotations.Metadata(description="An attribute which specifies MnS consuner's requirements for the validity period of the resource reservation.") + + + @@ -8241,6 +9355,34 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + @org.onap.aai.annotations.Metadata(description="An attribute which specifies the resource reservation result for the feasibility check job.Allowed values -RESERVED,UNRESERVED,USED") + + + + + + + @org.onap.aai.annotations.Metadata(description="An attribute that specifies the additional reason information if the reservation is failed.") + + + + + + + @org.onap.aai.annotations.Metadata(description="An attribute which specifies the actual validity period of the resource reservation.") + + + + + + + @org.onap.aai.annotations.Metadata(description="An attribute that specifies the recommended network slicing related requirements which can be supported by the MnS producer.") + + + @@ -8277,6 +9419,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v29/DbEdgeRules_v29.json b/aai-schema/src/main/resources/onap/dbedgerules/v29/DbEdgeRules_v29.json index 12b652e..8c84f66 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v29/DbEdgeRules_v29.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v29/DbEdgeRules_v29.json @@ -7145,6 +7145,18 @@ "prevent-delete": "NONE", "default": "true", "description": "slice-profile belongsTo feasibility-check-and-reservation-job" + }, + { + "from": "service-profile", + "to": "feasibility-check-and-reservation-job", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description": "service-profile belongsTo feasibility-check-and-reservation-job" }, { "from": "feasibility-time-window", @@ -7153,7 +7165,7 @@ "direction": "OUT", "multiplicity": "MANY2ONE", "contains-other-v": "!${direction}", - "delete-other-v": "NONE", + "delete-other-v": "!${direction}", "SVC-INFRA": "NONE", "prevent-delete": "NONE", "default": "true", @@ -7166,7 +7178,7 @@ "direction": "OUT", "multiplicity": "MANY2ONE", "contains-other-v": "!${direction}", - "delete-other-v": "NONE", + "delete-other-v": "!${direction}", "SVC-INFRA": "NONE", "prevent-delete": "NONE", "default": "true", @@ -7179,7 +7191,7 @@ "direction": "OUT", "multiplicity": "MANY2ONE", "contains-other-v": "!${direction}", - "delete-other-v": "NONE", + "delete-other-v": "!${direction}", "SVC-INFRA": "NONE", "prevent-delete": "NONE", "default": "true", @@ -7192,11 +7204,298 @@ "direction": "OUT", "multiplicity": "MANY2ONE", "contains-other-v": "!${direction}", - "delete-other-v": "NONE", + "delete-other-v": "!${direction}", "SVC-INFRA": "NONE", "prevent-delete": "NONE", "default": "true", "description": "snssai belongsTo plmn-info" + }, + { + "from": "delay-tolerance", + "to": "slice-profile", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "delay-tolerance belongs to slice-profile" + }, + { + "from": "serv-attr-com", + "to": "delay-tolerance", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "serv-attr-com belongsTo delay-tolerance" + }, + { + "from": "term-density", + "to": "slice-profile", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "term-density belongs to slice-profile" + }, + { + "from": "serv-attr-com", + "to": "term-density", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "serv-attr-com belongsTo term-density" + }, + { + "from": "synchronicity", + "to": "slice-profile", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "synchronicity belongs to slice-profile" + }, + { + "from": "serv-attr-com", + "to": "synchronicity", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "serv-attr-com belongsTo synchronicity" + }, + { + "from": "positioning", + "to": "slice-profile", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "positioning belongs to slice-profile" + }, + { + "from": "serv-attr-com", + "to": "positioning", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "serv-attr-com belongsTo positioning" + }, + { + "from": "kpi-monitoring", + "to": "slice-profile", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "kpi-monitoring belongs to slice-profile" + }, + { + "from": "serv-attr-com", + "to": "kpi-monitoring", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "serv-attr-com belongsTo kpi-monitoring" + }, + { + "from": "dl-deterministic-comm", + "to": "slice-profile", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "dl deterministic comm belongs to slice-profile" + }, + { + "from": "serv-attr-com", + "to": "dl-deterministic-comm", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "serv-attr-com belongsTo dl-deterministic-comm" + }, + { + "from": "ul-deterministic-comm", + "to": "slice-profile", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "ul-deterministic-comm belongs to slice-profile" + }, + { + "from": "serv-attr-com", + "to": "ul-deterministic-comm", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "serv-attr-com belongsTo ul-deterministic-comm" + }, + { + "from": "dl-thpt-per-slice-subnet", + "to": "slice-profile", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "dl-thpt-per-slice-subnet belongs to slice-profile" + }, + { + "from": "serv-attr-com", + "to": "dl-thpt-per-slice-subnet", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "serv-attr-com belongsTo dl-thpt-per-slice-subnet" + }, + { + "from": "ul-thpt-per-slice-subnet", + "to": "slice-profile", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "ul-thpt-per-slice-subnet belongs to slice-profile" + }, + { + "from": "serv-attr-com", + "to": "ul-thpt-per-slice-subnet", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "serv-attr-com belongsTo ul-thpt-per-slice-subnet" + }, + { + "from": "dl-thpt-per-ue", + "to": "slice-profile", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "dl-thpt-per-ue belongs to slice-profile" + }, + { + "from": "serv-attr-com", + "to": "dl-thpt-per-ue", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "serv-attr-com belongsTo dl-thpt-per-ue" + }, + { + "from": "ul-thpt-per-ue", + "to": "slice-profile", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "ul-thpt-per-ue belongs to slice-profile" + }, + { + "from": "serv-attr-com", + "to": "ul-thpt-per-ue", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "serv-attr-com belongsTo ul-thpt-per-ue" } + ] } diff --git a/aai-schema/src/main/resources/onap/oxm/v29/aai_oxm_v29.xml b/aai-schema/src/main/resources/onap/oxm/v29/aai_oxm_v29.xml index 03bfad8..05ee6ba 100644 --- a/aai-schema/src/main/resources/onap/oxm/v29/aai_oxm_v29.xml +++ b/aai-schema/src/main/resources/onap/oxm/v29/aai_oxm_v29.xml @@ -5146,11 +5146,22 @@ + + + + + + + + + + + - + @@ -16129,27 +16140,97 @@ - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16163,6 +16244,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -16230,38 +16331,38 @@ - + - - - + + + - + - + - - - + + + - + - + - + - + - + @@ -16288,39 +16389,39 @@ - - - - - - + + + + + + - - - + + + - + - + - - - + + + - + - + - + - + - + @@ -16347,39 +16448,44 @@ - - - - - - + + + + + + - - - + + + - + - + - - - + + + - + - + - + - + - + + + + + + @@ -16406,50 +16512,843 @@ - - - - - - + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + - + + + + + + + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16479,6 +17378,7 @@ + -- cgit 1.2.3-korg