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

OpenAPI/5gcNrm.yaml

+29 −24

Original line number	Diff line number	Diff line
		@@ -265,26 +265,7 @@ components:
		type: integer
		exponent:
		type: integer
		FiveQICharacteristics:
		type: object
		properties:
		fiveQIValue:
		type: integer
		resourceType:
		type: string
		enum:
		- GBR
		- NonGBR
		priorityLevel:
		type: integer
		packetDelayBudget:
		type: integer
		packetErrorRate:
		$ref: '#/components/schemas/PacketErrorRate'
		averagingWindow:
		type: integer
		maximumDataBurstVolume:
		type: integer



		GtpUPathDelayThresholdsType:
		@@ -1101,8 +1082,6 @@ components:
		$ref: '#/components/schemas/ManagedNFProfile'
		capabilityList:
		$ref: '#/components/schemas/CapabilityList'
		isINEF:
		type: boolean
		isCAPIFSup:
		type: boolean
		- $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
		@@ -1637,6 +1616,32 @@ components:
		items:
		$ref: '#/components/schemas/FiveQiDscpMapping'

		FiveQICharacteristics-Single:
		allOf:
		- $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
		- type: object
		properties:
		fiveQIValue:
		type: integer
		resourceType:
		type: string
		enum:
		- GBR
		- NonGBR
		priorityLevel:
		type: integer
		packetDelayBudget:
		type: integer
		packetErrorRate:
		$ref: '#/components/schemas/PacketErrorRate'
		averagingWindow:
		type: integer
		maximumDataBurstVolume:
		type: integer
		FiveQICharacteristics-Multiple:
		type: array
		items:
		$ref: '#/components/schemas/FiveQICharacteristics-Single'
		Configurable5QISet-Single:
		allOf:
		- $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
		@@ -1649,7 +1654,7 @@ components:
		configurable5QIs:
		type: array
		items:
		$ref: '#/components/schemas/FiveQICharacteristics'
		$ref: '#/components/schemas/FiveQICharacteristics-Multiple'

		Dynamic5QISet-Single:
		allOf:
		@@ -1663,7 +1668,7 @@ components:
		dynamic5QIs:
		type: array
		items:
		$ref: '#/components/schemas/FiveQICharacteristics'
		$ref: '#/components/schemas/FiveQICharacteristics-Multiple'

		GtpUPathQoSMonitoringControl-Single:
		allOf:

OpenAPI/genericNrm.yaml

+16 −0

Original line number	Diff line number	Diff line
		@@ -1206,6 +1206,10 @@ components:
		$ref: '#/components/schemas/TraceJob-Multiple'
		AlarmList:
		$ref: '#/components/schemas/AlarmList-Single'
		MnsRegistry:
		type: array
		items:
		$ref: '#/components/schemas/MnsRegistry'
		ManagedElement-ncO:
		type: object
		properties:
		@@ -1342,6 +1346,18 @@ components:
		TraceJob:
		$ref: '#/components/schemas/TraceJob-Multiple'

		MnsRegistry:
		type: object
		properties:
		mnsLabel:
		type: string
		mnsType:
		type: string
		mnsVersion:
		type: string
		mnsAddress:
		type: string

		#-------- Definition of concrete IOCs --------------------------------------------

		VsDataContainer-Single:

OpenAPI/sliceNrm.yaml

+16 −2

Original line number	Diff line number	Diff line
		@@ -466,6 +466,18 @@ components:
		- $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr'
		- $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr'

		LogicInterfaceInfo:
		type: object
		properties:
		logicalInterfceType:
		type: string
		enum:
		- VLAN
		- MPLS
		- Segment
		logicalInterfceId:
		type: string

		ServiceProfileList:
		type: array
		items:
		@@ -538,6 +550,8 @@ components:
		$ref: '#/components/schemas/SliceProfileList'
		epTransportRefList:
		$ref: 'genericNrm.yaml#/components/schemas/DnList'
		priorityLabel:
		type: integer

		EP_Transport-Single:
		allOf:
		@@ -549,8 +563,8 @@ components:
		properties:
		ipAddress:
		$ref: '#/components/schemas/IpAddress'
		logicInterfaceId:
		type: string
		logicInterfaceInfo:
		$ref: '#/components/schemas/LogicInterfaceInfo'
		nextHopInfo:
		type: string
		qosProfile:

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

+44 −1

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@ module _3gpp-5g-common-yang-types {
		network slicing.";
		reference "3GPP TS 28.541";

		revision 2021-08-05 { reference S5-214053/CR-0518; }
		revision 2020-11-05 { reference CR-0412 ; }
		revision 2019-10-20 { reference "Initial version."; }

		@@ -72,7 +73,8 @@ module _3gpp-5g-common-yang-types {

		enum INDIRECT_COMMUNICATION_WITH_DEDICATED_DISCOVERY {
		value 3;
		description "Communication to NF service discovered by NRF through SCP as a proxy.";
		description "Communication to NF service discovered by NRF through SCP
		as a proxy.";
		}

		}
		@@ -102,4 +104,45 @@ module _3gpp-5g-common-yang-types {
		}
		}

		typedef EnergySavingLoadThresholdT {
		type uint32 {
		range 0..10000;
		}
		units 1/10000;
		}

		typedef EnergySavingTimeDurationT {
		type uint32 {
		range 0..900;
		}
		units seconds;
		}

		typedef PhysCellID {
		type uint32 {
		range "0..1007";
		}
		reference "clause 7.4.2 of TS 38.211";
		}

		typedef UTC24TimeOfDayT {
		description "Time of day in HH:MM or H:MM 24-hour format per UTC
		time zone.";
		type string {
		pattern "(([01]?[0-9])\|(2[0-3])):([0-5][0-9])";
		}
		}

		typedef DayOfWeekT {
		type enumeration {
		enum Monday;
		enum Tuesday;
		enum Wednesday;
		enum Thursday;
		enum Friday;
		enum Saturday;
		enum Sunday;
		}
		}

		}
		No newline at end of file

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -44,10 +44,6 @@ module _3gpp-5gc-nrm-neffunction {
		type string;
		}

		leaf isINEF {
		type boolean;
		}

		leaf isCAPIFSup {
		type boolean;
		}