Corrected and updated. (4a6fc6e3) · Commits · Miguel Angel Reina Ortega / Management and Orchestration APIs

yang-models/_3gpp-common-managementdatacollection.yang

+3 −2

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ module _3gpp-common-managementdatacollection {
		Integration Reference Point (IRP);
		Information Service (IS)";

		revision 2022-11-04 { reference "CR-XXXX"; }
		revision 2022-11-04 { reference "CR-0194"; }



		@@ -54,6 +54,7 @@ module _3gpp-common-managementdatacollection {
		}
		uses Tai; // (Maybe type: types3gpp:Tai,if we define Tai there.)
		// mandatory false
		min-elements 1
		description "It specifies a location(s) from where the management data
		shall be collected. It is defined in terms of TAI(s).";
		}
		@@ -264,7 +265,7 @@ module _3gpp-common-managementdatacollection {
		The MnS producer will derive multiple jobs ('PerfMetricJob',
		'TraceJob') from a single 'ManagementDataCollection' job for collecting
		the required management data. Once it receives the measurement from
		multiple sources, it consolidate the data into a set of management data
		multiple sources, it consolidates the data into a set of management data
		for reporting.

		The attribute 'collectionTimeWindow' specifies the time window for which

yang-models/_3gpp-common-measurements.yang

+3 −53

Original line number	Diff line number	Diff line
		@@ -273,62 +273,12 @@ module _3gpp-common-measurements {
		contains the root object and all descendant objects.";
		}

		choice reportingCtrl {
		mandatory true;
		description "This choice defines the method for reporting collected
		performance metrics to MnS consumers as well as the parameters for
		configuring the reporting function. It is a choice between the control
		parameter required for the reporting methods, whose presence selects
		the reporting method as follows:
		- When only the fileReportingPeriod attribute is present, the MnS
		producer shall store files on the MnS producer at a location selected
		by the MnS producer and inform the MnS consumer about the availability
		of new files and the file location using the notifyFileReady
		notification.
		- When only the fileReportingPeriod and fileLocation attributes are
		present, the MnS producer shall store the files on the MnS consumer at
		the location specified by fileLocation. No notification is emitted by
		the MnS producer.
		- When only the streamTarget attribute is present, the MnS producer
		shall stream the data to the location specified by streamTarget.

		For the file-based reporting methods the fileReportingPeriod attribute
		specifies the time window during which collected measurements are stored
		into the same file before the file is closed and a new file is opened.";

		case file-based-reporting {
		leaf fileReportingPeriod {
		type uint32 {
		range 1..max;
		}
		units minutes;
		uses types3gpp:ReportingCtrl {
		refine "reportingCtrl/file-based-reporting/fileReportingPeriod" {
		must '(number(.)*"60") mod number(../granularityPeriod) = "0"' {
		error-message
		"The time-period must be a multiple of the granularityPeriod.";
		}
		mandatory true;
		description "For the file-based reporting method this is the time
		window during which collected measurements are stored into the same
		file before the file is closed and a new file is opened.
		The time-period must be a multiple of the granularityPeriod.

		Applicable when the file-based reporting method is supported";
		}

		leaf fileLocation {
		type string ;
		description "Applicable and must be present when the file-based
		reporting method is supported, and the files are stored on the MnS
		consumer.";
		}
		}
		case stream-based-reporting {
		leaf streamTarget {
		type string;
		mandatory true;
		description "Applicable when stream-based reporting method is
		supported.";
		}
		}
		}
		}

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

+7 −16

Original line number	Diff line number	Diff line
		@@ -13,7 +13,8 @@ module _3gpp-common-yang-types {
		network slicing.";
		reference "3GPP TS 28.623";

		revision 2022-07-26 { reference CR-0180 ; }
		revision 2022-11-04 { reference "CR-0194"; }
		revision 2022-07-26 { reference "CR-0180"; }
		revision 2022-02-09 { reference "CR-0144"; }
		revision 2021-11-01 { reference "CR-0141"; }

		@@ -793,14 +794,6 @@ module _3gpp-common-yang-types {
		range 1..max;
		}
		units minutes;
		// PerE: he rows below come from reportingCtrl in XXX.They assume an
		// attribute "granularityPreiod" one level up, but that cannot be
		// assumed to be always true.

		// must '(number(.)*"60") mod number(../granularityPeriod) = "0"' {
		// error-message
		// "The time-period must be a multiple of the granularityPeriod.";
		//}
		mandatory true;
		description "For the file-based reporting method this is the time
		window during which collected measurements are stored into the same
		@@ -809,9 +802,6 @@ module _3gpp-common-yang-types {

		Applicable when the file-based reporting method is supported.";
		}
		}

		// Begin new section
		choice reporting-target {
		case file-target {
		leaf fileLocation {
		@@ -832,8 +822,8 @@ module _3gpp-common-yang-types {
		description "When netiher fileLocation or notificationRecipientAddress
		are present, the files are stored and available to the MnS consumer
		if the MnS subscribes to the notifyFileReady notification.";
		} // End inner choice
		// End new section
		}
		}

		case stream-based-reporting {
		leaf streamTarget {
		@@ -843,6 +833,7 @@ module _3gpp-common-yang-types {
		supported.";
		}
		}
		} // End outer choice

		}
		}
		}
		No newline at end of file