Merge branch 'balazs-r17-baseline-creator-after-SA91' into 'Rel17-draft' (122099be) · Commits · Miguel Angel Reina Ortega / Management and Orchestration APIs

yang-models/_3gpp-5g-common-yang-types.yang

+48 −14

Original line number	Diff line number	Diff line
		@@ -7,14 +7,47 @@ module _3gpp-5g-common-yang-types {
		import _3gpp-common-yang-types { prefix types3gpp; }

		organization "3GPP SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description "The model defines common types for 5G networks and
		network slicing.";
		reference "3GPP TS 28.541";

		revision 2019-10-20 {
		description "Initial version.";
		reference "Based on
		3GPP TS 28.541 V16.X.XX";
		revision 2020-11-05 { reference CR-0412 ; }
		revision 2019-10-20 { reference "Initial version."; }

		grouping SNssai {
		description
		"Single Network Slice Selection Assistance Information(S-NSSAI)";
		reference "3GPP TS 23.003";

		leaf sd {
		description "Slice Differentiator
		If not needed, the value can be set to FFFFFF.";
		type string{
		length 6;
		pattern '[a-fA-F0-9]*';
		}
		reference "3GPP TS 23.003";
		}

		leaf sst {
		type uint8;
		description "Slice/Service Type.
		Values 0 to 127 belong to standardized SST range and are defined in
		3GPP TS 23.501. Values 128 to 255 belong to operator-specific range.";
		}
		}

		grouping PLMNInfo {
		description "The PLMNInfo data type define a S-NSSAI member in a specific
		PLMNId, and it have two attributes PLMNId and S-NSSAI (PLMNId, S-NSSAI).
		The PLMNId represents a data type that is comprised of mcc
		(mobile country code) and mnc (mobile network code), (See TS 23.003
		subclause 2.2 and 12.1) and S-NSSAI represents an data type, that is
		comprised of an SST (Slice/Service type) and an optional
		SD (Slice Differentiator) field";
		uses types3gpp:PLMNId;
		uses SNssai;
		}

		typedef CommModelType {
		@@ -27,12 +60,14 @@ module _3gpp-5g-common-yang-types {

		enum DIRECT_COMMUNICATION_WITH_NRF {
		value 1;
		description "Directly communicate to other NF service discovered by NRF.";
		description "Directly communicate to other NF service discovered
		by NRF.";
		}

		enum INDIRECT_COMMUNICATION_WO_DEDICATED_DISCOVERY {
		value 2;
		description "Communicate to pre-configured other NF service through SCP as a proxy.";
		description "Communicate to pre-configured other NF service through
		SCP as a proxy.";
		}

		enum INDIRECT_COMMUNICATION_WITH_DEDICATED_DISCOVERY {
		@@ -51,7 +86,6 @@ module _3gpp-5g-common-yang-types {
		type CommModelType;
		}
		leaf-list targetNFServiceList {

		type types3gpp:DistinguishedName;
		}
		leaf commModelConfiguration {

yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang

+11 −5

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl {
		prefix gtpUPathQMCtrl3gpp;

		import _3gpp-common-managed-element { prefix me3gpp; }
		import _3gpp-common-yang-types { prefix types3gpp; }
		import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
		import _3gpp-5gc-nrm-smffunction { prefix smf3gpp; }
		import _3gpp-common-top { prefix top3gpp; }

		@@ -15,10 +15,15 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl {
		of GTP-U path QoS monitoring defined in 3GPP TS 23.501.";
		reference "3GPP TS 28.541";

		revision 2020-11-05 { reference CR-0412 ; }
		revision 2020-09-30 { reference "CR-0393"; }
		revision 2020-08-03 { reference "CR-0321"; }
		revision 2020-04-10 { reference "S5-202103"; }

		grouping GtpUPathDelayThresholdsType {
		description "Thresholds for reporting the packet delay for GTP-U path QoS
		monitoring ";
		reference "3GPP TS 29.244";
		leaf n3AveragePacketDelayThreshold {
		mandatory true;
		type uint32;
		@@ -57,11 +62,12 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl {
		}
		}

		leaf-list gtpUPathMonitoredSNSSAIs {
		list gtpUPathMonitoredSNSSAIs {
		key "sd sst";
		description "The S-NSSAIs for which the the GTP-U path QoS monitoring is
		to be performed.";
		reference "3GPP TS 23.003";
		type types3gpp:SNssai;
		uses types5g3gpp:SNssai;
		}

		leaf-list monitoredDSCPs {

yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang

+13 −9

Original line number	Diff line number	Diff line
		@@ -5,20 +5,23 @@ module _3gpp-5gc-nrm-QFQoSMonitoringControl {
		prefix qFQMCtrl3gpp;

		import _3gpp-common-managed-element { prefix me3gpp; }
		import _3gpp-common-yang-types { prefix types3gpp; }
		import _3gpp-5gc-nrm-smffunction { prefix smf3gpp; }
		import _3gpp-common-top { prefix top3gpp; }
		import _3gpp-5g-common-yang-types { prefix types5g3gpp; }

		organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description "This IOC represents the capabilities and properties for control
		of QoS monitoring per QoS flow per UE for URLLC service defined

		in 3GPP TS 23.501.";
		reference "3GPP TS 28.541";

		revision 2020-11-05 { reference CR-0412 ; }
		revision 2020-08-03 { reference "CR-0321"; }
		revision 2020-04-10 { reference "S5-202101"; }

		grouping QFPacketDelayThresholdsTypeGrp {
		description "Represents the QFPacketDelayThresholdsType";
		leaf thresholdDl {
		type uint32;
		units milliseconds;
		@@ -51,12 +54,12 @@ module _3gpp-5gc-nrm-QFQoSMonitoringControl {
		}
		}

		leaf-list qFMonitoredSNSSAIs {
		list qFMonitoredSNSSAIs {
		description "The S-NSSAIs for which the QoS monitoring per QoS flow
		per UE is to be performed.";
		reference "3GPP TS 23.003";
		type types3gpp:SNssai;
		}
		key "sd sst";
		uses types5g3gpp:SNssai;}

		leaf-list qFMonitored5QIs {
		description "The 5QIs for which the QoS monitoring per QoS flow
		@@ -110,7 +113,8 @@ module _3gpp-5gc-nrm-QFQoSMonitoringControl {
		}

		leaf qFMeasurementPeriod {
		description "It specifies the period (in seconds) for reporting the packet delay for QoS monitoring per QoS flow per UE.";
		description "It specifies the period (in seconds) for reporting the
		packet delay for QoS monitoring per QoS flow per UE.";
		type uint32;
		}
		}

yang-models/_3gpp-5gc-nrm-amffunction.yang

+20 −13

Original line number	Diff line number	Diff line
		@@ -10,58 +10,65 @@ module _3gpp-5gc-nrm-amffunction {
		import ietf-inet-types { prefix inet; }
		import _3gpp-common-top { prefix top3gpp; }

		organization "3gpp SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description "AMFFunction derived from basic ManagedFunction.";

		revision 2020-11-05 { reference CR-0412 ; }
		revision 2019-10-25 { reference "S5-194457 S5-193518"; }

		revision 2019-05-31 {
		description "Ericsson refactoring.";
		}

		revision 2018-08-07 {
		description "Initial revision";
		}
		revision 2019-05-31 { reference "Ericsson refactoring."; }
		revision 2018-08-07 { reference "Initial revision"; }

		grouping AMFFunctionGrp {
		description "Represents the AMFFunction IOC";
		uses mf3gpp:ManagedFunctionGrp;

		list pLMNIdList {
		min-elements 1;
		description "A list of PLMN identifiers (Mobile Country Code and Mobile Network Code).";
		description "A list of PLMN identifiers (Mobile Country Code and Mobile
		Network Code).";
		key "mcc mnc";
		uses types3gpp:PLMNId;
		}

		container aMFIdentifier {
		presence true;
		description "An AMF identifier, comprising an AMF Region ID, an AMF Set ID and an AMF Pointer.";
		description "An AMF identifier, comprising an AMF Region ID, an
		AMF Set ID and an AMF Pointer.";
		uses types3gpp:AmfIdentifier;
		}

		leaf sBIFQDN {
		description "The FQDN of the registered NF instance in the service-based interface.";
		description "The FQDN of the registered NF instance in the
		service-based interface.";
		type inet:domain-name;
		}

		leaf-list sNSSAIList {
		min-elements 0; // conditionally mandatory if network slicing feature is supported
		list sNSSAIList {
		min-elements 1;
		description "List of S-NSSAIs the managed object is capable of supporting.
		(Single Network Slice Selection Assistance Information)
		An S-NSSAI has an SST (Slice/Service type) and an optional SD
		(Slice Differentiator) field.";
		reference "3GPP TS 23.003";
		type types3gpp:SNssai;
		key "sd sst";
		uses types5g3gpp:SNssai;
		}

		list managedNFProfile {
		key idx;
		min-elements 1;
		max-elements 1;
		uses types3gpp:ManagedNFProfile;
		}

		list commModelList {
		min-elements 1;
		key "groupId";
		description "Specifies a list of commModel. It can be used by NF and
		NF services to interact with each other in 5G Core network ";
		reference "3GPP TS 23.501";
		uses types5g3gpp:CommModel;
		}

yang-models/_3gpp-5gc-nrm-amfregion.yang

+16 −8

Original line number	Diff line number	Diff line
		@@ -7,20 +7,27 @@ module _3gpp-5gc-nrm-amfregion {
		import _3gpp-common-subnetwork { prefix subnet3gpp; }
		import _3gpp-common-top { prefix top3gpp; }
		import _3gpp-common-managed-function { prefix mf3gpp; }
		import _3gpp-5g-common-yang-types { prefix types5g3gpp; }

		description "This IOC represents the AMF Region which consists one or multiple AMF Sets.";
		organization "3gpp SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description "This IOC represents the AMF Region which consists one or
		multiple AMF Sets.";

		revision 2020-11-05 { reference CR-0412 ; }
		revision 2019-10-28 { reference S5-193518 ; }
		revision 2019-06-11 {
		description "Ericsson refactoring.";
		}
		reference "Ericsson refactoring."; }

		grouping AMFRegionGrp {
		description "Represents the AMFRegion IOC";
		uses mf3gpp:ManagedFunctionGrp;

		list pLMNIdList {
		description "List of at most six entries of PLMN Identifiers, but at least one (the primary PLMN Id).
		The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC).";
		description "List of at most six entries of PLMN Identifiers, but at
		least one (the primary PLMN Id).
		The PLMN Identifier is composed of a Mobile Country Code (MCC)
		and a Mobile Network Code (MNC).";

		min-elements 1;
		max-elements 6;
		@@ -37,14 +44,15 @@ module _3gpp-5gc-nrm-amfregion {
		type types3gpp:Tac;
		}

		leaf-list sNSSAIList {
		list sNSSAIList {
		description "List of S-NSSAIs the managed object is capable of supporting.
		(Single Network Slice Selection Assistance Information)
		An S-NSSAI has an SST (Slice/Service type) and an optional SD
		(Slice Differentiator) field.";
		//conditional support only if the network slicing feature is supported.
		reference "3GPP TS 23.003";
		type types3gpp:SNssai;
		key "sd sst";
		uses types5g3gpp:SNssai;
		}

		leaf aMFRegionId {