From cad12a0205c9a9154ac16803e917e2f08d5f72f6 Mon Sep 17 00:00:00 2001
From: zm330 <zhangminyj@chinamobile.com>
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 <zhangminyj@chinamobile.com>
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"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="exp-data-rate-UL" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="User experience data rate of upload.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="exp-data-rate-DL" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="User experience data rate of download.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="area-traffic-cap-UL" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The area traffic capbility of upload.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="area-traffic-cap-DL" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The area traffic capbility of download.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="activity-factor" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The activity factor.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="jitter" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="jitter")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="survival-time" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Survival Time")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cs-availability" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The availability requirement for an network slice instance, expressed as a percentage.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="reliability" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The reliability requirement for an network slice instance, expressed as a percentage.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="exp-data-rate" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="User experience data rate.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="traffic-density" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="traffic density")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="conn-density" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="connection density")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
+		<xs:element name="activity-factor" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@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.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="jitter" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The jitter requirements of network slice.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="survival-time" type="xs:string" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="An attribute specifies the time that an application consuming a communication service may continue without an anticipated message.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="availability" type="xs:float" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This parameter specifies the availability requirement, expressed as a percentage.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="reliability" type="xs:string" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@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.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="dl-thpt-per-slice" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@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.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="dl-thpt-per-UE" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This attribute defines downlink data rate supported by the network slice per UE.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="ul-thpt-per-slice" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@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.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="ul-thpt-per-UE" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="uLThptPerUE Integer 1 This attribute defines uplink data rate supported by the network slice per UE.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="max-pkt-size" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This parameter specifies the maximum packet size supported by the network slice.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="max-number-of-conns" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This parameter defines the maximum number of concurrent sessions supported by the network slice.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="term-density" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="An attribute specifies the overall user density over the coverage area of the network slice.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -4297,97 +4297,83 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="activity-factor" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The activity factor.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="e2e-latency" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="e2e latency")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="jitter" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="jitter")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="survival-time" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Survival Time")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cs-availability" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The availability requirement for an network slice subnet instance, expressed as a percentage.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="max-bandwidth" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The maximum bandwidth (mb) of the connection links in a transport slice instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="reliability" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The reliability requirement for an network slice subnet instance, expressed as a percentage.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="exp-data-rate" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="User experience data rate.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="payload-size" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="payload size.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="traffic-density" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="traffic density")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="conn-density" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="connection density")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-area-dimension" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="service area dimension")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="s-nssai" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="S-NSSAI")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
+		<xs:element name="activity-factor" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@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.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="jitter" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The jitter requirements of network slice subnet.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="survival-time" type="xs:string" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="survivalTime	String 1 Survival time for network slice subnet.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="cs-availability-target" type="xs:float" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Communica¬tion service availability target value.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="max-bandwidth" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Maxmun bandwidth value of TN network. ")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="exp-data-rate" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Expected date rate for uRLLC.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="max-number-of-PDU-session" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The maximum number of PDU sessions that can simultaneously/concurrently access to the network slice.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="overall-user-density" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Overall User Density.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="cs-reliability-mean-time" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Communication service reliability mean time between failures.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="msg-size-byte" type="xs:string" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Message size(byte) .")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="transfer-interval-target" type="xs:string" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Target value of transfer interval.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
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"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="exp-data-rate-UL" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="User experience data rate of upload.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="exp-data-rate-DL" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="User experience data rate of download.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="area-traffic-cap-UL" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The area traffic capbility of upload.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="area-traffic-cap-DL" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The area traffic capbility of download.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="activity-factor" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The activity factor.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="jitter" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="jitter")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="survival-time" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Survival Time")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cs-availability" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The availability requirement for an network slice instance, expressed as a percentage.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="reliability" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The reliability requirement for an network slice instance, expressed as a percentage.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="exp-data-rate" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="User experience data rate.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="traffic-density" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="traffic density")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="conn-density" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="connection density")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
+		<xs:element name="activity-factor" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@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.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="jitter" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The jitter requirements of network slice.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="survival-time" type="xs:string" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="An attribute specifies the time that an application consuming a communication service may continue without an anticipated message.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="availability" type="xs:float" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This parameter specifies the availability requirement, expressed as a percentage.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="reliability" type="xs:string" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@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.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="dl-thpt-per-slice" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@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.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="dl-thpt-per-UE" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This attribute defines downlink data rate supported by the network slice per UE.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="ul-thpt-per-slice" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@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.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="ul-thpt-per-UE" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="uLThptPerUE Integer 1 This attribute defines uplink data rate supported by the network slice per UE.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="max-pkt-size" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This parameter specifies the maximum packet size supported by the network slice.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="max-number-of-conns" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This parameter defines the maximum number of concurrent sessions supported by the network slice.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="term-density" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="An attribute specifies the overall user density over the coverage area of the network slice.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -4993,97 +4993,83 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="activity-factor" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The activity factor.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="e2e-latency" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="e2e latency")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="jitter" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="jitter")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="survival-time" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Survival Time")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cs-availability" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The availability requirement for an network slice subnet instance, expressed as a percentage.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="max-bandwidth" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The maximum bandwidth (mb) of the connection links in a transport slice instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="reliability" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The reliability requirement for an network slice subnet instance, expressed as a percentage.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="exp-data-rate" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="User experience data rate.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="payload-size" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="payload size.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="traffic-density" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="traffic density")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="conn-density" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="connection density")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-area-dimension" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="service area dimension")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="s-nssai" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="S-NSSAI")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
+		<xs:element name="activity-factor" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@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.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="jitter" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The jitter requirements of network slice subnet.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="survival-time" type="xs:string" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="survivalTime	String 1 Survival time for network slice subnet.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="cs-availability-target" type="xs:float" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Communica¬tion service availability target value.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="max-bandwidth" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Maxmun bandwidth value of TN network. ")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="exp-data-rate" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Expected date rate for uRLLC.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="max-number-of-PDU-session" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The maximum number of PDU sessions that can simultaneously/concurrently access to the network slice.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="overall-user-density" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Overall User Density.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="cs-reliability-mean-time" type="xs:int" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Communication service reliability mean time between failures.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="msg-size-byte" type="xs:string" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Message size(byte) .")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="transfer-interval-target" type="xs:string" minOccurs="0">
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Target value of transfer interval.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:element>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
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 @@
                         <xml-property name="description" value="A list of TrackingAreas where the NSI can be selected."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="uEMobilityLevel" name="ue-mobility-level" type="java.lang.String">
+                <xml-element java-attribute="ueMobilityLevel" name="ue-mobility-level" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="User mobility level, value can be stationary, nomadic, restricted mobility, fully mobility."/>
                     </xml-properties>
@@ -9865,66 +9865,66 @@
                         <xml-property name="description" value="Whether the resources to be allocated to the network slice instance may be shared with another network slice instance(s)."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="expDataRateUL" name="exp-data-rate-UL" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="User experience data rate of upload."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="expDataRateDL" name="exp-data-rate-DL" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="User experience data rate of download."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="areaTrafficCapUL" name="area-traffic-cap-UL" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="The area traffic capbility of upload."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="areaTrafficCapDL" name="area-traffic-cap-DL" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="The area traffic capbility of download."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="activityFactor" name="activity-factor" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="The activity factor."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="jitter" name="jitter" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="jitter"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="survivalTime" name="survival-time" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="Survival Time"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="csAvailability" name="cs-availability" type="java.lang.Float">
-                    <xml-properties>
-                        <xml-property name="description" value="The availability requirement for an network slice instance, expressed as a percentage."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="reliability" name="reliability" type="java.lang.Float">
-                    <xml-properties>
-                        <xml-property name="description" value="The reliability requirement for an network slice instance, expressed as a percentage."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="expDataRate" name="exp-data-rate" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="User experience data rate."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="trafficDensity" name="traffic-density" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="traffic density"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="connDensity" name="conn-density" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="connection density"/>
-                    </xml-properties>
-                </xml-element>
+				<xml-element java-attribute="activityFactor" name="activity-factor" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="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."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="jitter" name="jitter" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="The jitter requirements of network slice."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="survivalTime" name="survival-time" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="An attribute specifies the time that an application consuming a communication service may continue without an anticipated message."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="availability" name="availability" type="java.lang.Float">
+					<xml-properties>
+						<xml-property name="description" value="This parameter specifies the availability requirement, expressed as a percentage."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="reliability" name="reliability" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="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."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="dlThptPerSlice" name="dl-thpt-per-slice" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="This attribute defines achievable data rate of the network slice in downlink that is available ubiquitously across the coverage area of the slice."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="dlThptPerUE" name="dl-thpt-per-UE" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="This attribute defines downlink data rate supported by the network slice per UE."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ulThptPerSlice" name="ul-thpt-per-slice" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="This attribute defines achievable data rate of the network slice in uplink that is available ubiquitously across the coverage area of the slice."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ulThptPerUE" name="ul-thpt-per-UE" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="This attribute defines uplink data rate supported by the network slice per UE."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="maxPktSize" name="max-pkt-size" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="This parameter specifies the maximum packet size supported by the network slice."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="maxNumberOfConns" name="max-number-of-conns" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="This parameter defines the maximum number of concurrent sessions supported by the network slice."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="termDensity" name="term-density" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="An attribute specifies the overall user density over the coverage area of the network slice."/>
+					</xml-properties>
+				</xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
@@ -9974,7 +9974,7 @@
                         <xml-property name="description" value="A list of TrackingAreas where the NSSI can be selected."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="uEMobilityLevel" name="ue-mobility-level" type="java.lang.String">
+				<xml-element java-attribute="ueMobilityLevel" name="ue-mobility-level" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="User mobility level, value can be stationary, nomadic, restricted mobility, fully mobility."/>
                     </xml-properties>
@@ -10004,71 +10004,61 @@
                         <xml-property name="description" value="The area traffic capbility of download."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="activityFactor" name="activity-factor" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="The activity factor."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="e2eLatency" name="e2e-latency" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="e2e latency"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="jitter" name="jitter" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="jitter"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="survivalTime" name="survival-time" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="Survival Time"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="csAvailability" name="cs-availability" type="java.lang.Float">
-                    <xml-properties>
-                        <xml-property name="description" value="The availability requirement for an network slice subnet instance, expressed as a percentage."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="maxBandwidth" name="max-bandwidth" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="The maximum bandwidth (mb) of the connection links in a transport slice instance."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="reliability" name="reliability" type="java.lang.Float">
-                    <xml-properties>
-                        <xml-property name="description" value="The reliability requirement for an network slice subnet instance, expressed as a percentage."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="expDataRate" name="exp-data-rate" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="User experience data rate."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="payloadSize" name="payload-size" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="payload size."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="trafficDensity" name="traffic-density" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="traffic density"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="connDensity" name="conn-density" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="connection density"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="serviceAreaDimension" name="service-area-dimension" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="service area dimension"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="S-NSSAI" name="s-nssai" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="S-NSSAI"/>
-                    </xml-properties>
-                </xml-element>
+				<xml-element java-attribute="activityFactor" name="activity-factor" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="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."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="jitter" name="jitter" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="The jitter requirements of network slice subnet."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="survivalTime" name="survival-time" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Survival time for network slice subnet."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="csAvailabilityTarget" name="cs-availability-target" type="java.lang.Float">
+					<xml-properties>
+						<xml-property name="description" value="Communication service availability target value."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="maxBandwidth" name="max-bandwidth" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="Maxmun bandwidth value of TN network."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="expDataRate" name="exp-data-rate" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="Expected date rate for uRLLC."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="maxNumberOfPDUSession" name="max-number-of-PDU-session" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="maxNumberofPDUSession Integer 1	The maximum number of PDU sessions that can simultaneously/concurrently access to the network slice."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="overallUserDensity" name="overall-user-density" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="Overall User Density."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="csReliabilityMeanTime" name="cs-reliability-mean-time" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Communication service reliability mean time between failures."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="msgSizeByte" name="msg-size-byte" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Message size(byte) ."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="transferIntervalTarget" name="transfer-interval-target" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="transferIntervalTarget String 1	Target value of transfer interval."/>
+					</xml-properties>
+				</xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
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 @@
             </xml-properties>
 		</java-type>
 		<java-type name="ServiceProfiles">
-            <xml-properties>
-                <xml-property name="description" value="Collection of E2E slice service profile."/>
-            </xml-properties>
-            <xml-root-element name="service-profiles"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="serviceProfile" name="service-profile" type="inventory.aai.onap.org.v21.ServiceProfile"/>
-            </java-attributes>
-        </java-type>
-        <java-type name="ServiceProfile">
-            <xml-root-element name="service-profile"/>
-            <java-attributes>
-                <xml-element java-attribute="profileId" name="profile-id" required="true" type="java.lang.String" xml-key="true" >
-                    <xml-properties>
-                        <xml-property name="description" value="ID of the profile."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="latency" name="latency" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="The packet transmission latency (millisecond) through the RAN, CN, and TN part of 5G network and is used to evaluate utilization performance of the end-to-end network slice instance."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="maxNumberOfUEs" name="max-number-of-UEs" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="The maximum number of UEs may simultaneously access the E2E slice service"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="coverageAreaTAList" name="coverage-area-TA-list" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="A list of TrackingAreas where the NSI can be selected."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="uEMobilityLevel" name="ue-mobility-level" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="User mobility level, value can be stationary, nomadic, restricted mobility, fully mobility."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="resourceSharingLevel" name="resource-sharing-level" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Whether the resources to be allocated to the network slice instance may be shared with another network slice instance(s)."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="expDataRateUL" name="exp-data-rate-UL" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="User experience data rate of upload."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="expDataRateDL" name="exp-data-rate-DL" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="User experience data rate of download."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="areaTrafficCapUL" name="area-traffic-cap-UL" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="The area traffic capbility of upload."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="areaTrafficCapDL" name="area-traffic-cap-DL" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="The area traffic capbility of download."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="activityFactor" name="activity-factor" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="The activity factor."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="jitter" name="jitter" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="jitter"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="survivalTime" name="survival-time" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="Survival Time"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="csAvailability" name="cs-availability" type="java.lang.Float">
-                    <xml-properties>
-                        <xml-property name="description" value="The availability requirement for an network slice instance, expressed as a percentage."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="reliability" name="reliability" type="java.lang.Float">
-                    <xml-properties>
-                        <xml-property name="description" value="The reliability requirement for an network slice instance, expressed as a percentage."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="expDataRate" name="exp-data-rate" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="User experience data rate."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="trafficDensity" name="traffic-density" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="traffic density"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="connDensity" name="conn-density" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="connection density"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Requirement of E2E Slice service."/>
-                <xml-property name="uniqueProps" value="profile-id"/>
-                <xml-property name="indexedProps" value="profile-id"/>
-                <xml-property name="container" value="service-profiles"/>
-                <xml-property name="dependentOn" value="service-instance"/>
-                <xml-property name="uriTemplate" value="/service-instances/service-instance/{service-instance-id}/service-profiles/service-profile/{profile-id}"/>
-                <xml-property name="searcheable" value="profile-id"/>
-            </xml-properties>
+			<xml-properties>
+				<xml-property name="description" value="Collection of E2E slice service profile."/>
+			</xml-properties>
+			<xml-root-element name="service-profiles"/>
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="serviceProfile" name="service-profile" type="inventory.aai.onap.org.v21.ServiceProfile"/>
+			</java-attributes>
+		</java-type>
+		<java-type name="ServiceProfile">
+			<xml-root-element name="service-profile"/>
+			<java-attributes>
+				<xml-element java-attribute="profileId" name="profile-id" required="true" type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="ID of the profile."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="latency" name="latency" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="The packet transmission latency (millisecond) through the RAN, CN, and TN part of 5G network and is used to evaluate utilization performance of the end-to-end network slice instance."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="maxNumberOfUEs" name="max-number-of-UEs" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="The maximum number of UEs may simultaneously access the E2E slice service"/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="coverageAreaTAList" name="coverage-area-TA-list" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="A list of TrackingAreas where the NSI can be selected."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="uEMobilityLevel" name="ue-mobility-level" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="User mobility level, value can be stationary, nomadic, restricted mobility, fully mobility."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceSharingLevel" name="resource-sharing-level" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Whether the resources to be allocated to the network slice instance may be shared with another network slice instance(s)."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="activityFactor" name="activity-factor" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="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."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="jitter" name="jitter" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="The jitter requirements of network slice."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="survivalTime" name="survival-time" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="An attribute specifies the time that an application consuming a communication service may continue without an anticipated message."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="availability" name="availability" type="java.lang.Float">
+					<xml-properties>
+						<xml-property name="description" value="This parameter specifies the availability requirement, expressed as a percentage."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="reliability" name="reliability" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="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."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="dlThptPerSlice" name="dl-thpt-per-slice" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="This attribute defines achievable data rate of the network slice in downlink that is available ubiquitously across the coverage area of the slice."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="dlThptPerUE" name="dl-thpt-per-UE" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="This attribute defines downlink data rate supported by the network slice per UE."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ulThptPerSlice" name="ul-thpt-per-slice" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="This attribute defines achievable data rate of the network slice in uplink that is available ubiquitously across the coverage area of the slice."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ulThptPerUE" name="ul-thpt-per-UE" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="This attribute defines uplink data rate supported by the network slice per UE."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="maxPktSize" name="max-pkt-size" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="This parameter specifies the maximum packet size supported by the network slice."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="maxNumberOfConns" name="max-number-of-conns" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="This parameter defines the maximum number of concurrent sessions supported by the network slice."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="termDensity" name="term-density" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="An attribute specifies the overall user density over the coverage area of the network slice."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/>
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Requirement of E2E Slice service."/>
+				<xml-property name="uniqueProps" value="profile-id"/>
+				<xml-property name="indexedProps" value="profile-id"/>
+				<xml-property name="container" value="service-profiles"/>
+				<xml-property name="dependentOn" value="service-instance"/>
+				<xml-property name="uriTemplate" value="/service-instances/service-instance/{service-instance-id}/service-profiles/service-profile/{profile-id}"/>
+				<xml-property name="searcheable" value="profile-id"/>
+			</xml-properties>
 		</java-type>
 		<java-type name="SliceProfiles">
-            <xml-properties>
-                <xml-property name="description" value="Collection of slice subnet service profile."/>
-            </xml-properties>
-            <xml-root-element name="slice-profiles"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="sliceProfile" name="slice-profile" type="inventory.aai.onap.org.v21.SliceProfile"/>
-            </java-attributes>
-        </java-type>
-        <java-type name="SliceProfile">
-            <xml-root-element name="slice-profile"/>
-            <java-attributes>
-                <xml-element java-attribute="profileId" name="profile-id" required="true" type="java.lang.String" xml-key="true" >
-                    <xml-properties>
-                        <xml-property name="description" value="ID of the profile."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="latency" name="latency" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="The packet transmission latency (millisecond) through the RAN or CN or TN and is used to evaluate utilization performance of the end-to-end network slice instance."/>
-                    </xml-properties>
-                </xml-element>
+			<xml-properties>
+				<xml-property name="description" value="Collection of slice subnet service profile."/>
+			</xml-properties>
+			<xml-root-element name="slice-profiles"/>
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="sliceProfile" name="slice-profile" type="inventory.aai.onap.org.v21.SliceProfile"/>
+			</java-attributes>
+		</java-type>
+		<java-type name="SliceProfile">
+			<xml-root-element name="slice-profile"/>
+			<java-attributes>
+				<xml-element java-attribute="profileId" name="profile-id" required="true" type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="ID of the profile."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="latency" name="latency" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="The packet transmission latency (millisecond) through the RAN or CN or TN and is used to evaluate utilization performance of the end-to-end network slice instance."/>
+					</xml-properties>
+				</xml-element>
                 <xml-element java-attribute="maxNumberOfUEs" name="max-number-of-UEs" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="The maximum number of UEs may simultaneously access the slice subnet service"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="coverageAreaTAList" name="coverage-area-TA-list" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="A list of TrackingAreas where the NSSI can be selected."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="uEMobilityLevel" name="ue-mobility-level" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="User mobility level, value can be stationary, nomadic, restricted mobility, fully mobility."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="resourceSharingLevel" name="resource-sharing-level" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Whether the resources to be allocated to the slice subnet instance may be shared with another network slice instance(s)."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="expDataRateUL" name="exp-data-rate-UL" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="User experience data rate of upload."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="expDataRateDL" name="exp-data-rate-DL" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="User experience data rate of download."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="areaTrafficCapUL" name="area-traffic-cap-UL" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="The area traffic capbility of upload."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="areaTrafficCapDL" name="area-traffic-cap-DL" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="The area traffic capbility of download."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="activityFactor" name="activity-factor" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="The activity factor."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="e2eLatency" name="e2e-latency" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="e2e latency"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="jitter" name="jitter" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="jitter"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="survivalTime" name="survival-time" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="Survival Time"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="csAvailability" name="cs-availability" type="java.lang.Float">
-                    <xml-properties>
-                        <xml-property name="description" value="The availability requirement for an network slice subnet instance, expressed as a percentage."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="maxBandwidth" name="max-bandwidth" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="The maximum bandwidth (mb) of the connection links in a transport slice instance."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="reliability" name="reliability" type="java.lang.Float">
-                    <xml-properties>
-                        <xml-property name="description" value="The reliability requirement for an network slice subnet instance, expressed as a percentage."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="expDataRate" name="exp-data-rate" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="User experience data rate."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="payloadSize" name="payload-size" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="payload size."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="trafficDensity" name="traffic-density" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="traffic density"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="connDensity" name="conn-density" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="connection density"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="serviceAreaDimension" name="service-area-dimension" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="service area dimension"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="S-NSSAI" name="s-nssai" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="S-NSSAI"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Requirement of network slice subnet service."/>
-                <xml-property name="uniqueProps" value="profile-id"/>
-                <xml-property name="indexedProps" value="profile-id"/>
-                <xml-property name="container" value="slice-profiles"/>
-                <xml-property name="dependentOn" value="service-instance"/>
-                <xml-property name="uriTemplate" value="/service-instances/service-instance/{service-instance-id}/slice-profiles/slice-profile/{profile-id}"/>
-                <xml-property name="searcheable" value="profile-id"/>
-            </xml-properties>
+					<xml-properties>
+						<xml-property name="description" value="The maximum number of UEs may simultaneously access the slice subnet service"/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="coverageAreaTAList" name="coverage-area-TA-list" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="A list of TrackingAreas where the NSSI can be selected."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ueMobilityLevel" name="ue-mobility-level" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="User mobility level, value can be stationary, nomadic, restricted mobility, fully mobility."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceSharingLevel" name="resource-sharing-level" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Whether the resources to be allocated to the slice subnet instance may be shared with another network slice instance(s)."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="expDataRateUL" name="exp-data-rate-UL" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="User experience data rate of upload."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="expDataRateDL" name="exp-data-rate-DL" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="User experience data rate of download."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="areaTrafficCapUL" name="area-traffic-cap-UL" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="The area traffic capbility of upload."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="areaTrafficCapDL" name="area-traffic-cap-DL" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="The area traffic capbility of download."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="activityFactor" name="activity-factor" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="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."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="jitter" name="jitter" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="The jitter requirements of network slice subnet."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="survivalTime" name="survival-time" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Survival time for network slice subnet."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="csAvailabilityTarget" name="cs-availability-target" type="java.lang.Float">
+					<xml-properties>
+						<xml-property name="description" value="Communication service availability target value."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="maxBandwidth" name="max-bandwidth" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="Maxmun bandwidth value of TN network."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="expDataRate" name="exp-data-rate" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="Expected date rate for uRLLC."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="maxNumberOfPDUSession" name="max-number-of-PDU-session" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="maxNumberofPDUSession Integer 1	The maximum number of PDU sessions that can simultaneously/concurrently access to the network slice."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="overallUserDensity" name="overall-user-density" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="Overall User Density."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="csReliabilityMeanTime" name="cs-reliability-mean-time" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Communication service reliability mean time between failures."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="msgSizeByte" name="msg-size-byte" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Message size(byte) ."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="transferIntervalTarget" name="transfer-interval-target" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="transferIntervalTarget String 1	Target value of transfer interval."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/>
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Requirement of network slice subnet service."/>
+				<xml-property name="uniqueProps" value="profile-id"/>
+				<xml-property name="indexedProps" value="profile-id"/>
+				<xml-property name="container" value="slice-profiles"/>
+				<xml-property name="dependentOn" value="service-instance"/>
+				<xml-property name="uriTemplate" value="/service-instances/service-instance/{service-instance-id}/slice-profiles/slice-profile/{profile-id}"/>
+				<xml-property name="searcheable" value="profile-id"/>
+			</xml-properties>
 		</java-type>
 	</java-types>
 </xml-bindings>
-- 
cgit 1.2.3-korg