From cad12a0205c9a9154ac16803e917e2f08d5f72f6 Mon Sep 17 00:00:00 2001 From: zm330 Date: Tue, 8 Sep 2020 16:01:37 +0800 Subject: Update serviceProfile and sliceProfile attributes According to 3GPP add some attributes and delete some attributes of serviceProfile and sliceProfile for E2E network slicing usecase. Issue-ID: AAI-2919 Signed-off-by: zm330 Change-Id: If715f7432cde1254315ff1f2587cc0af59a21a10 --- .../resources/onap/aai_schema/aai_schema_v20.xsd | 336 +++++++------- .../resources/onap/aai_schema/aai_schema_v21.xsd | 336 +++++++------- .../main/resources/onap/oxm/v20/aai_oxm_v20.xml | 244 +++++----- .../main/resources/onap/oxm/v21/aai_oxm_v21.xml | 506 ++++++++++----------- 4 files changed, 687 insertions(+), 735 deletions(-) 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 78fc166..133af0a 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="User experience data rate of upload.") - - - - - - - @org.onap.aai.annotations.Metadata(description="User experience data rate of download.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The area traffic capbility of upload.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The area traffic capbility of download.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The activity factor.") - - - - - - - @org.onap.aai.annotations.Metadata(description="jitter") - - - - - - - @org.onap.aai.annotations.Metadata(description="Survival Time") - - - - - - - @org.onap.aai.annotations.Metadata(description="The availability requirement for an network slice instance, expressed as a percentage.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The reliability requirement for an network slice instance, expressed as a percentage.") - - - - - - - @org.onap.aai.annotations.Metadata(description="User experience data rate.") - - - - - - - @org.onap.aai.annotations.Metadata(description="traffic density") - - - - - - - @org.onap.aai.annotations.Metadata(description="connection density") - - - + + + + @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.") + + + @@ -4297,97 +4297,83 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - @org.onap.aai.annotations.Metadata(description="The activity factor.") - - - - - - - @org.onap.aai.annotations.Metadata(description="e2e latency") - - - - - - - @org.onap.aai.annotations.Metadata(description="jitter") - - - - - - - @org.onap.aai.annotations.Metadata(description="Survival Time") - - - - - - - @org.onap.aai.annotations.Metadata(description="The availability requirement for an network slice subnet instance, expressed as a percentage.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The maximum bandwidth (mb) of the connection links in a transport slice instance.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The reliability requirement for an network slice subnet instance, expressed as a percentage.") - - - - - - - @org.onap.aai.annotations.Metadata(description="User experience data rate.") - - - - - - - @org.onap.aai.annotations.Metadata(description="payload size.") - - - - - - - @org.onap.aai.annotations.Metadata(description="traffic density") - - - - - - - @org.onap.aai.annotations.Metadata(description="connection density") - - - - - - - @org.onap.aai.annotations.Metadata(description="service area dimension") - - - - - - - @org.onap.aai.annotations.Metadata(description="S-NSSAI") - - - + + + + @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.") + + + 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 9a79e12..dd5c869 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="User experience data rate of upload.") - - - - - - - @org.onap.aai.annotations.Metadata(description="User experience data rate of download.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The area traffic capbility of upload.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The area traffic capbility of download.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The activity factor.") - - - - - - - @org.onap.aai.annotations.Metadata(description="jitter") - - - - - - - @org.onap.aai.annotations.Metadata(description="Survival Time") - - - - - - - @org.onap.aai.annotations.Metadata(description="The availability requirement for an network slice instance, expressed as a percentage.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The reliability requirement for an network slice instance, expressed as a percentage.") - - - - - - - @org.onap.aai.annotations.Metadata(description="User experience data rate.") - - - - - - - @org.onap.aai.annotations.Metadata(description="traffic density") - - - - - - - @org.onap.aai.annotations.Metadata(description="connection density") - - - + + + + @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.") + + + @@ -4993,97 +4993,83 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - @org.onap.aai.annotations.Metadata(description="The activity factor.") - - - - - - - @org.onap.aai.annotations.Metadata(description="e2e latency") - - - - - - - @org.onap.aai.annotations.Metadata(description="jitter") - - - - - - - @org.onap.aai.annotations.Metadata(description="Survival Time") - - - - - - - @org.onap.aai.annotations.Metadata(description="The availability requirement for an network slice subnet instance, expressed as a percentage.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The maximum bandwidth (mb) of the connection links in a transport slice instance.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The reliability requirement for an network slice subnet instance, expressed as a percentage.") - - - - - - - @org.onap.aai.annotations.Metadata(description="User experience data rate.") - - - - - - - @org.onap.aai.annotations.Metadata(description="payload size.") - - - - - - - @org.onap.aai.annotations.Metadata(description="traffic density") - - - - - - - @org.onap.aai.annotations.Metadata(description="connection density") - - - - - - - @org.onap.aai.annotations.Metadata(description="service area dimension") - - - - - - - @org.onap.aai.annotations.Metadata(description="S-NSSAI") - - - + + + + @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.") + + + 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 42ed39d..15433a3 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 @@ -9855,7 +9855,7 @@ - + @@ -9865,66 +9865,66 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9974,7 +9974,7 @@ - + @@ -10004,71 +10004,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 374482a..fbd604d 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 @@ -12303,267 +12303,257 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg