Merge branch 'Integration_Rel17_SA5_137_YANG_merge_helper' into 'Rel17-draft' (ccc8249e) · Commits · Miguel Angel Reina Ortega / Management and Orchestration APIs

yang-models/README.md

+2 −1

Original line number	Diff line number	Diff line
		@@ -5,3 +5,4 @@ All commited YANG modules MUST pass the
		"pyang --strict -p external-yams _3gpp-*.yang"
		validation command without errors.


		No newline at end of file

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

+29 −8

Original line number	Diff line number	Diff line
		@@ -37,7 +37,13 @@ module _3gpp-5gc-nrm-configurable5qiset {
		}
		}

		grouping FiveQICharacteristics {
		grouping FiveQICharacteristicsGrp {
		description "Represents the FiveQICharacteristics IOC.";
		reference "3GPP TS 28.541";
		}

		list configurableFiveQIs {
		key fiveQIValue;
		leaf fiveQIValue {
		type uint32 {
		range 0..255 ;
		@@ -94,14 +100,29 @@ module _3gpp-5gc-nrm-configurable5qiset {
		}
		}

		grouping FiveQiCharacteristicsSubtree {
		description "Represents the FiveQICharacterics IOC.";
		list FiveQICharacteristics {
		key id;
		uses top3gpp:Top_Grp;
		container attributes {
		uses FiveQICharacteristicsGrp;
		}
		}
		}

		grouping Configurable5QISetGrp {
		description "Represents the Configurable5QISet IOC.";
		list configurable5QIs {
		key "fiveQIValue";
		uses FiveQICharacteristics;
		key id;
		uses top3gpp:Top_Grp;
		container attributes {
		uses FiveQICharacteristicsGrp;
		}
		}
		}


		grouping Configurable5QISetSubtree {
		list Configurable5QISet {
		description "Specifies the non-standardized 5QIs, including their QoS

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

+6 −4

Original line number	Diff line number	Diff line
		@@ -21,9 +21,11 @@ module _3gpp-5gc-nrm-dynamic5qiset {
		grouping Dynamic5QISetGrp {
		description "Represents the Dynamic5QISet IOC.";
		list dynamic5QIs {
		key "fiveQIValue";
		description "Represents the Dynamic5QISet IOC.";
		uses Conf5QIs3gpp:FiveQICharacteristics;
		key id;
		uses top3gpp:Top_Grp;
		container attributes {
		uses Conf5QIs3gpp:FiveQICharacteristicsGrp;
		}
		}
		}

yang-models/_3gpp-common-fm.yang

+179 −178

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

		revision 2021-06-02 { reference "CR-0130"; }
		revision 2020-06-03 { reference "CR-0091"; }
		revision 2020-02-24 {
		reference "S5-201365";
		@@ -238,7 +239,8 @@ module _3gpp-common-fm {
		type string;
		config false ;
		description "Indicates MO attributes whose value changes are being
		monitored. See definition in ITU-T Recommendation X.733 clause 8.1.2.11.";
		monitored.";
		reference "ITU-T Recommendation X.733 clause 8.1.2.11.";
		}

		leaf proposedRepairActions {
		@@ -253,8 +255,7 @@ module _3gpp-common-fm {
		config false ;
		}

		leaf additionalInformation {
		type string;
		anydata additionalInformation {
		config false ;
		}

yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang

+193 −1

Original line number	Diff line number	Diff line
		@@ -25,9 +25,73 @@ module _3gpp-nr-nrm-cesmanagementfunction {
		uses top3gpp:Top_Grp;

		leaf cesSwitch {
		description "This attribute determines whether the Cross Domain-Centralized SON energy saving function is enabled or disabled.";
		description "This attribute determines whether the Centralized SON energy saving function is enabled or disabled.";
		type boolean;
		}
		list intraRatEsActivationOriginalCellLoadParameters {
		key loadThreshold;
		description "This attributes is relevant, if the cell acts as an original cell.This attribute indicates the traffic load threshold and the time duration, which are used by distributed ES algorithms to allow a cell to enter the energySaving state.";
		leaf loadThreshold {type int32;}
		container attributes {
		uses IntraRatEsActivationOriginalCellLoadParametersGrp;
		}
		}


		list intraRatEsActivationCandidateCellsLoadParameters {
		key loadThreshold;
		description "This attribute indicates the traffic load threshold and the time duration, which are used by distributed ES algorithms level to allow a n ‘original’ cell to enter the energySaving state.";
		leaf loadThreshold {type int32;}
		container attributes {
		uses IntraRatEsActivationCandidateCellsLoadParametersGrp;
		}
		}

		list intraRatEsDeactivationCandidateCellsLoadParameters {
		key loadThreshold;
		description "This attributes is relevant, if the cell acts as a candidate cell.This attribute indicates the traffic load threshold and the time duration which is used by distributed ES algorithms to allow a cell to leave the energySaving state.";
		leaf loadThreshold {type int32;}
		container attributes {
		uses IntraRatEsDeactivationCandidateCellsLoadParametersGrp;
		}
		}

		list esNotAllowedTimePeriod {
		key startTimeandendTime;
		description "This attribute indicates a list of time periods during which inter-RAT energy saving is not allowed.";
		leaf startTimeandendTime {type string;}
		container attributes {
		uses EsNotAllowedTimePeriodGrp;
		}
		}

		list interRatEsActivationOriginalCellParameters {
		key loadThreshold;
		description "This attribute indicates the traffic load threshold and the time duration, which are used by distributed inter-RAT ES algorithms to allow an original cell to enter the energySaving state.";
		leaf loadThreshold {type int32;}
		container attributes {
		uses InterRatEsActivationOriginalCellParametersGrp;
		}
		}

		list interRatEsActivationCandidateCellParameters {
		key loadThreshold;
		description "This attribute indicates the traffic load threshold and the time duration, which are used by distributed inter-RAT ES algorithms to allow an original cell to enter the energySaving state.";
		leaf loadThreshold {type int32;}
		container attributes {
		uses InterRatEsActivationCandidateCellParametersGrp;
		}
		}

		list interRatEsDeactivationCandidateCellParameters {
		key loadThreshold;
		description "This attribute indicates the traffic load threshold and the time duration which is used by distributed inter-RAT ES algorithms to allow an original cell to leave the energySaving state.";
		leaf loadThreshold {type int32;}
		container attributes {
		uses InterRatEsDeactivationCandidateCellParametersGrp;
		}
		}


		leaf energySavingState {
		description "Specifies the status regarding the energy saving in the cell. If the value of energySavingControl is toBeEnergySaving, then it shall be tried to achieve the value isEnergySaving for the energySavingState. If the value of energySavingControl is toBeNotEnergySaving, then it shall be tried to achieve the value isNotEnergySaving for the energySavingState. ";
		@@ -48,6 +112,134 @@ module _3gpp-nr-nrm-cesmanagementfunction {


		}
		grouping IntraRatEsActivationOriginalCellLoadParametersGrp {
		description "Represents the the traffic load threshold and the time duration.";

		leaf loadThreshold {
		description "This attribute is used by distributed ES algorithms to allow a cell to enter the energySaving state.";
		type int32 { range "0..10000"; }
		units "1";
		}


		leaf timeDuration {
		description " The time duration indicates how long the load needs to have been below the threshold.";
		type int32 { range "0..900"; }
		units "1";
		}
		}

		grouping IntraRatEsActivationCandidateCellsLoadParametersGrp {
		description "Represents the the traffic load threshold and the time duration.";

		leaf loadThreshold {
		description "This attribute is used by distributed ES algorithms to allow a cell to enter the energySaving state.";
		type int32 { range "0..10000"; }
		units "1";
		}


		leaf timeDuration {
		description " The time duration indicates how long the load needs to have been below the threshold.";
		type int32 { range "0..900"; }
		units "1";
		}
		}

		grouping IntraRatEsDeactivationCandidateCellsLoadParametersGrp {
		description "Represents the the traffic load threshold and the time duration.";

		leaf loadThreshold {
		description "This attribute is used by distributed ES algorithms to allow a cell to enter the energySaving state.";
		type int32 { range "0..10000"; }
		units "1";
		}


		leaf timeDuration {
		description " The time duration indicates how long the load needs to have been below the threshold.";
		type int32 { range "0..900"; }
		units "1";
		}
		}

		grouping EsNotAllowedTimePeriodGrp {
		description "Represents the the traffic load threshold and the time duration.";

		leaf startTimeandendTime {
		description "This field indicate valid UTC time.";
		type string;
		}


		leaf periodOfDay {
		description "This field indicate the period of day.";
		type string;
		}

		leaf daysOfWeekList {
		description "This field indicate the list of weekday.";
		type string;
		}

		leaf listoftimeperiods {
		description "This field indicate the list of time periods.";
		type string;
		}

		}

		grouping InterRatEsActivationOriginalCellParametersGrp {
		description "Represents the the traffic load threshold and the time duration.";

		leaf loadThreshold {
		description "The time duration indicates how long the traffic load (both for UL and DL) needs to have been below the threshold.";
		type int32 { range "0..10000"; }
		units "1";
		}


		leaf timeDuration {
		description " The time duration indicates how long the load needs to have been below the threshold.";
		type int32 { range "0..900"; }
		units "1";
		}
		}

		grouping InterRatEsActivationCandidateCellParametersGrp {
		description "Represents the the traffic load threshold and the time duration.";

		leaf loadThreshold {
		description "This attribute is used by distributed ES algorithms to allow a cell to enter the energySaving state.";
		type int32 { range "0..10000"; }
		units "1";
		}


		leaf timeDuration {
		description "The time duration indicates how long the traffic load (both for UL and DL) in the candidate cell needs to have been below the threshold before any original cells which will be provided backup coverage by the candidate cell enters energySaving state.";
		type int32 { range "0..900"; }
		units "1";
		}
		}

		grouping InterRatEsDeactivationCandidateCellParametersGrp {
		description "Represents the the traffic load threshold and the time duration.";

		leaf loadThreshold {
		description "This attribute is used by distributed ES algorithms to allow a cell to enter the energySaving state.";
		type int32 { range "0..10000"; }
		units "1";
		}


		leaf timeDuration {
		description "The time duration indicates how long the traffic load (either for UL or DL) in the candidate cell needs to have been above the threshold to wake up one or more original cells which have been provided backup coverage by the candidate cell.";
		type int32 { range "0..900"; }
		units "1";
		}
		}


		augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU" {
		if-feature nrcellcu3gpp:CESManagementFunction;