Fix the validation and formatting issue. (2c75be68) · Commits · Miguel Angel Reina Ortega / Management and Orchestration APIs

xsd/genericNrm.xsd

+58 −68

Original line number	Diff line number	Diff line
		@@ -12,8 +12,7 @@
		attributeFormDefault="unqualified"
		xmlns="http://www.w3.org/2001/XMLSchema"
		xmlns:xn="http://www.3gpp.org/ftp/specs/archive/28_series/28.623#genericNrm"
		xmlns:sp="http://www.3gpp.org/ftp/specs/archive/28_series/28.629#sonPolicyNrm"
		>
		xmlns:sp="http://www.3gpp.org/ftp/specs/archive/28_series/28.629#sonPolicyNrm">
		<import namespace="http://www.3gpp.org/ftp/specs/archive/28_series/28.629#sonPolicyNrm"/>
		<!-- Base XML type for all NRM class associated XML elements -->

		@@ -260,7 +259,6 @@
		</sequence>
		</complexType>


		<simpleType name="directionType">
		<list>
		<simpleType>
		@@ -435,14 +433,12 @@
		<all>
		<element name="userLabel" type="string"/>
		<element name="nFServiceType" type="xn:nFServiceType"/>
		<element name="sAP" type="xn:sAPType"/>
		<element name="operations" type="xn:operationsType" minOccurs="0"/>
		<element name="sAP" type="xn:SAP" minOccurs="0"/>
		<element name="operations" type="xn:operationsList" minOccurs="0"/>
		<element name="AdministrativeState" type="xn:pMAdministrativeStateType"/>
		<element name="OperationalState" type="xn:pMOperationalStateType"/>
		<element name="usageState" type="xn:usageStateType"/>
		<element name="registrationState" type="xn:registrationStateType"/>
		<element name="sAP" type="xn:SAP" minOccurs="0"/>
		<element name="operations" type="xn:operationsList" minOccurs="0"/>
		</all>
		</complexType>
		</element>
		@@ -586,7 +582,6 @@
		<element name="farEndEntity" type="xn:dn" minOccurs="0"/>
		<element name="userLabel" type="string" minOccurs="0"/>
		<element name="measurementsList" type="xn:MeasurementsList" minOccurs="0"/>
		<element name="measurements" type="xn:MeasurementTypesAndGPsList" minOccurs="0"/>
		</all>
		</complexType>
		</element>
		@@ -694,7 +689,7 @@
		<all>
		<element name="notificationRecipientAddress" type="string"/>
		<element name="notificationTypes" type="string" minOccurs="0" />
		<element name="scope" type="Scope"/>
		<element name="scope" type="xn:Scope"/>
		<element name="notificationFilter" type="string" minOccurs="0" />
		</all>
		</complexType>
		@@ -731,7 +726,6 @@
		type="xn:NrmClass"
		abstract="true"
		/>

		<!--
		Abstract head XML element for all XML elements associated to further
		NRM classes optionally contained under ManagedElement NRM class
		@@ -742,12 +736,10 @@
		type="xn:NrmClass"
		abstract="true"
		/>

		<!--
		Abstract head XML element for all XML elements associated to further
		NRM classes optionally contained under ThresholdMonitoringCapability NRM class
		-->

		<element
		name="ThresholdMonitoringCapabilityOptionallyContainedNrmClass"
		type="xn:NrmClass"
		@@ -758,12 +750,10 @@
		Abstract head XML element for all XML elements associated to further
		NRM classes optionally contained under ThresholdMonitor NRM class
		-->

		<element
		name="ThresholdMonitorOptionallyContainedNrmClass"
		type="xn:NrmClass"
		abstract="true"
		/>


		</schema>

xsd/ngcNrm.xsd

+232 −216

Original line number	Diff line number	Diff line
		@@ -11,9 +11,10 @@
		elementFormDefault="qualified"
		attributeFormDefault="unqualified"
		xmlns="http://www.w3.org/2001/XMLSchema"
		xmlns:xn="http://www.3gpp.org/ftp/specs/archive/28_series/28.623#genericNrm" xmlns:nn="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#nrNrm" xmlns:en="http://www.3gpp.org/ftp/specs/archive/28_series/28.659#eutranNrm"
		xmlns:ngc="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#ngcNrm"
		>
		xmlns:xn="http://www.3gpp.org/ftp/specs/archive/28_series/28.623#genericNrm"
		xmlns:nn="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#nrNrm"
		xmlns:en="http://www.3gpp.org/ftp/specs/archive/28_series/28.659#eutranNrm"
		xmlns:ngc="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#ngcNrm">

		<import namespace="http://www.3gpp.org/ftp/specs/archive/28_series/28.623#genericNrm"/>
		<import namespace="http://www.3gpp.org/ftp/specs/archive/28_series/28.659#eutranNrm"/>
		@@ -44,7 +45,8 @@ xmlns:ngc="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#ngcNrm"
		<maxInclusive value="63"/>
		<!-- The AMF Pointer is 6-bits length, defined in 23.003 -->
		</restriction>
		</simpleType> <complexType name="NrTACList">
		</simpleType>
		<complexType name="NrTACList">
		<sequence>
		<element name="tac" type="nn:NrTac" minOccurs="0" maxOccurs="unbounded"/>
		</sequence>
		@@ -101,7 +103,6 @@ xmlns:ngc="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#ngcNrm"
		<element name="nfInstanceID" type="string"/>
		<!-- nfInstanceID is uuid of NF instance -->
		<element name="nfType" type="ngc:NfType"/>
		<element name="nfType" type="ngc:NfType"/>
		<element name="sNssais" type="ngc:SnssaiList"/>
		<element name="fqdn" type="string"/>
		<element name="interPlmnFqdn" type="string"/>
		@@ -132,7 +133,7 @@ xmlns:ngc="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#ngcNrm"
		<element name="ipEndPoints" type="ngc:IpEndpoints"/>
		<element name="apiPrefix" type="string"/>
		<element name="defaultNotificationSubscriptions" type="ngc:DefaultNotificationSubscriptions"/>
		<element name="allowedPlmns" type="en:PLMNIdList"/>
		<element name="allowedPlmns" type="nn:PLMNIdList"/>
		<element name="allowedNfTypes" type="ngc:NFTypeList"/>
		<element name="allowedNssais" type="ngc:Nssai"/>
		<element name="capacity" type="string"/>
		@@ -210,6 +211,16 @@ xmlns:ngc="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#ngcNrm"
		<element name="snssaiUpfInfo" type="ngc:SnssaiUpfInfo"/>
		</sequence>
		</complexType>
		<complexType name="UdmInfo">
		<sequence>
		<element name="nFSrvGroupId" type="string"/>
		</sequence>
		</complexType>
		<complexType name="AusfInfo">
		<sequence>
		<element name="nFSrvGroupId" type="string"/>
		</sequence>
		</complexType>
		<complexType name="SnssaiUpfInfo">
		<sequence>
		<element name="sNssai" type="ngc:SNssai"/>
		@@ -281,7 +292,7 @@ xmlns:ngc="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#ngcNrm"
		<maxInclusive value="65535"/>
		<!-- SST is 2-octets length and defined in TS 23.003 -->
		</restriction>
		</complexType>
		</simpleType>
		<simpleType name="WeightFactor">
		<restriction base="integer">
		</restriction>
		@@ -347,7 +358,7 @@ xmlns:ngc="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#ngcNrm"
		<all>
		<element name="userLabel" type="string"/>
		<element name="vnfParametersList" type="xn:vnfParametersListType" minOccurs="0"/>
		<element name="pLMNIdList" type="en:PLMNIdList"/>
		<element name="pLMNIdList" type="nn:PLMNIdList"/>
		<element name="aMFIdentifier" type="ngc:aMFIdentifier"/>
		<element name="sBIFqdn" type="string"/>
		<element name="snssaiList" type="ngc:SnssaiList" minOccurs="0"/>
		@@ -687,7 +698,8 @@ xmlns:ngc="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#ngcNrm"
		<element name="sBIFqdn" type="string"/>
		<element name="nSIIdList" type="ngc:NSIIdList"/>
		<element name="snssaiList" type="ngc: SnssaiList" minOccurs="0"/>
		<element name="priority" type="integer" minOccurs="0"/> <element name="measurements" type="xn:MeasurementTypesAndGPsList" minOccurs="0"/>
		<element name="priority" type="integer" minOccurs="0"/>
		<element name="measurements" type="xn:MeasurementTypesAndGPsList" minOccurs="0"/>
		<element name="managedNFProfile" type="ngc:managedNFProfile" minOccurs="0"/>
		<element name="commModelList" type="ngc:CommModelList" minOccurs="1"/>
		</all>
		@@ -758,7 +770,8 @@ xmlns:ngc="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#ngcNrm"
		<choice minOccurs="0" maxOccurs="unbounded">
		<element ref="ngc:EP_NLS"/>
		<element ref="xn:VsDataContainer"/>
		<element ref="xn:MeasurementControl"/> </choice>
		<element ref="xn:MeasurementControl"/>
		</choice>
		</sequence>
		</extension>
		</complexContent>
		@@ -780,7 +793,8 @@ xmlns:ngc="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#ngcNrm"
		<element name="snssaiList" type="ngc:SnssaiList" minOccurs="0"/>
		<element name="priority" type="integer" minOccurs="0"/>
		<element name="measurements" type="xn:MeasurementTypesAndGPsList" minOccurs="0"/>
		<element name="managedNFProfile" type="ngc:managedNFProfile" minOccurs="0"/> <element name="commModelList" type="ngc:CommModelList" minOccurs="1"/>
		<element name="managedNFProfile" type="ngc:managedNFProfile" minOccurs="0"/>
		<element name="commModelList" type="ngc:CommModelList" minOccurs="1"/>
		</all>
		</complexType>
		</element>
		@@ -1510,6 +1524,7 @@ xmlns:ngc="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#ngcNrm"
		</complexContent>
		</complexType>
		</element>

		<element name="EP_N32">
		<complexType>
		<complexContent>
		@@ -1542,7 +1557,8 @@ xmlns:ngc="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#ngcNrm"
		</complexType>
		</element>

		<element name="EP_S5C"> <complexType>
		<element name="EP_S5C">
		<complexType>
		<complexContent>
		<extension base="xn:NrmClass">
		<sequence>

xsd/nrNrm.xsd

+1227 −1228

Original line number	Diff line number	Diff line
		@@ -351,7 +351,6 @@ targetNamespace="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#nrNrm" e
		<element name="gnbIdLength" type="nn:GnbIdLength"/>
		<element name="gnbDUId" type="nn:GnbDuId"/>
		<element name="gnbDuName" type="nn:GnbName" minOccurs="0"/>

		<element name="x2Blacklist" type="xn:dnList" minOccurs="0"/>
		<element name="x2Whitelist" type="xn:dnList" minOccurs="0"/>
		<element name="xnBlacklist" type="xn:dnList" minOccurs="0"/>
		@@ -438,7 +437,8 @@ targetNamespace="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#nrNrm" e
		<element name="measurements" type="xn:MeasurementTypesAndGPsList" minOccurs="0"/>
		<!--End of inherited attributes from ManagedFunction-->
		<element name="gNBCUUPId" type="nn:GnbCuupId "/>
		<element name="pLMNInfoList" type="PLMNInfoListType"/> <element name="gNBId" type="nn:GnbId"/>
		<element name="pLMNInfoList" type="PLMNInfoListType"/>
		<element name="gNBId" type="nn:GnbId"/>
		<element name="gnbIdLength" type="nn:GnbIdLength"/>
		</all>
		</complexType>
		@@ -1086,7 +1086,7 @@ targetNamespace="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#nrNrm" e
		<!--End of inherited attributes from ManagedFunction -->
		<element name="gnbId" type="nn:GnbId" />
		<element name="gnbIdLength" type="nn:GnbIdLength"/>
		<element name="pLMNId" type="en:PLMNIdList" />
		<element name="pLMNId" type="en:PLMNId"/>
		</all>
		</complexType>
		</element>
		@@ -1131,7 +1131,6 @@ targetNamespace="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#nrNrm" e
		<element name="attributes">
		<complexType>
		<all>

		<element name="quotaType" type="nn:quotaType"/>
		<element name="rRMPolicyMaxRatio" type="integer" minOccurs="1"/>
		<element name="rRMPolicyMarginMaxRatio" type="integer" minOccurs="0"/>
		@@ -1233,7 +1232,7 @@ targetNamespace="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#nrNrm" e
		<complexType>
		<all>
		<element name="nRTac" type="nn:NrTac" />
		<element name="pLMNId" type="en:PLMNIdList" />
		<element name="pLMNId" type="en:PLMNId" />
		</all>
		</complexType>
		</element>

xsd/sliceNrm.xsd

+62 −63

Original line number	Diff line number	Diff line
		@@ -56,9 +56,9 @@ targetNamespace="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#sliceNrm

		<complexType name="ServAttrCom">
		<sequence>
		<element name="category" type="Category"/>
		<element name="tagging" type="Tagging" minOccurs="0"/>
		<element name="exposure" type="Exposure" minOccurs="0"/>
		<element name="category" type="sl:Category"/>
		<element name="tagging" type="sl:Tagging" minOccurs="0"/>
		<element name="exposure" type="sl:Exposure" minOccurs="0"/>
		</sequence>
		</complexType >

		@@ -176,20 +176,20 @@ targetNamespace="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#sliceNrm
		<element name="resourceSharingLevel" type="integer" minOccurs="0"/>
		<element name="sst" type="ngc:Sst"/>
		<element name="availability" type="float" minOccurs="0"/>
		<element name="delayTolerance" type="DelayTolerance" minOccurs="0"/>
		<element name="deterministicComm" type="DeterminComm" minOccurs="0"/>
		<element name="dLThptPerSlice" type="DLThpt" minOccurs="0"/>
		<element name="dLThptPerUE" type="DLThpt" minOccurs="0"/>
		<element name="uLThptPerSlic" type="ULThpt" minOccurs="0"/>
		<element name="uLThptPerUE" type="ULThpt" minOccurs="0"/>
		<element name="maxPktSize" type="MaxPktSize" minOccurs="0"/>
		<element name="maxNumberofConns" type="MaxNumberofConns" minOccurs="0"/>
		<element name="kPIMonitoring" type="KPIMonitoring" minOccurs="0"/>
		<element name="supportedAccessTech" type="SupportedAccessTech" minOccurs="0"/>
		<element name="userMgmtOpen" type="UserMgmtOpen" minOccurs="0"/>
		<element name="v2XCommModels" type="V2XCommMode" minOccurs="0"/>
		<element name="delayTolerance" type="sl:DelayTolerance" minOccurs="0"/>
		<element name="deterministicComm" type="sl:DeterminComm" minOccurs="0"/>
		<element name="dLThptPerSlice" type="sl:DLThpt" minOccurs="0"/>
		<element name="dLThptPerUE" type="sl:DLThpt" minOccurs="0"/>
		<element name="uLThptPerSlic" type="sl:ULThpt" minOccurs="0"/>
		<element name="uLThptPerUE" type="sl:ULThpt" minOccurs="0"/>
		<element name="maxPktSize" type="sl:MaxPktSize" minOccurs="0"/>
		<element name="maxNumberofConns" type="long" minOccurs="0"/>
		<element name="kPIMonitoring" type="sl:KPIMonitoring" minOccurs="0"/>
		<element name="supportedAccessTech" type="sl:SupportedAccessTech" minOccurs="0"/>
		<element name="userMgmtOpen" type="sl:UserMgmtOpen" minOccurs="0"/>
		<element name="v2XCommModels" type="sl:V2XCommMode" minOccurs="0"/>
		<element name="coverageArea" type="string" minOccurs="0"/>
		<element name="termDensity" type="TermDensity" minOccurs="0"/>
		<element name="termDensity" type="sl:TermDensity" minOccurs="0"/>
		<element name="activityFactor" type="float" minOccurs="0"/>
		<element name="uESpeed" type="integer" minOccurs="0"/>
		<element name="jitter" type="integer" minOccurs="0"/>
		@@ -208,13 +208,11 @@ targetNamespace="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#sliceNrm
		<element name="sliceProfileId" type="string"/>
		<element name="sNSSAIList" type=" ngc:SnssaiList"/>
		<element name="pLMNIdList" type="en:PLMNIdList"/>
		<element name="perfReq" type="sl:PerfReq"/>
		<element name="maxNumberofUEs" type="long" minOccurs="0"/>
		<element name="coverageAreaTAList" type="ngc:NrTACList" minOccurs="0"/>
		<element name="latency" type="integer" minOccurs="0"/>
		<element name="uEMobilityLevel" type="sl:MobilityLevel" minOccurs="0"/>
		<element name="resourceSharingLevel" type="integer" minOccurs="0"/>

		</sequence>
		</complexType>
		<complexType name="SliceProfileList">
		@@ -249,7 +247,8 @@ targetNamespace="http://www.3gpp.org/ftp/specs/archive/28_series/28.541#sliceNrm

		<element name="operationalState" type="sm:operationalStateType"/>
		<element name="administrativeState" type="sm:administrativeStateType"/>
		<element name="serviceProfileList" type="sl:ServiceProfileList"/> <element name="networkSliceSubnetRef" type="xn:dn"/>
		<element name="serviceProfileList" type="sl:ServiceProfileList"/>
		<element name="networkSliceSubnetRef" type="xn:dn"/>
		</all>
		</complexType>
		</element>