Merge branch 'Integration_Rel16_SA5_138_YANG' into 'Rel-16' (24867d82) · Commits · Miguel Angel Reina Ortega / Management and Orchestration APIs

OpenAPI/5gcNrm.yaml

+0 −2

Original line number	Diff line number	Diff line
		@@ -1051,8 +1051,6 @@ components:
		$ref: '#/components/schemas/ManagedNFProfile'
		capabilityList:
		$ref: '#/components/schemas/CapabilityList'
		isINEF:
		type: boolean
		isCAPIFSup:
		type: boolean
		- $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'

OpenAPI/PerfMeasJobCtrlMnS.yaml

0 → 100644

+277 −0

Original line number	Diff line number	Diff line
		openapi: 3.0.1
		info:
		title: TS 28.550 Performance Measurement Job Control Service
		version: 16.8.0
		description: >-
		OAS 3.0.1 specification of the Performance Measurement Job Control Service
		@ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
		All rights reserved.
		externalDocs:
		description: 3GPP TS 28.550 V16.8.0; Performance assurance
		url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.550/
		servers:
		- url: '{MnSRoot}/PerfMeasJobCtrlMnS/{MnSVersion}'
		variables:
		MnSRoot:
		description: See clause 4.4.2 of TS 32.158
		default: http://example.com/3GPPManagement
		MnSVersion:
		description: Version number of the OpenAPI definition
		default: XXX
		paths:
		/measJobs:
		post:
		summary: Create a measurement job
		description: To create a measurement job the representation of the measurement job is POSTed on the /measJobs collection resource.
		requestBody:
		required: true
		content:
		application/json:
		schema:
		$ref: '#/components/schemas/measJobCreation-RequestType'
		responses:
		'201':
		description: Success case ("201 Created"). The representation of the newly created measurement job resource shall be returned.
		content:
		application/json:
		schema:
		$ref: '#/components/schemas/measJobCreation-ResponseType'
		'202':
		description: Partial success case ("202 Partically created"). The representation of the newly created measurement job resource with unsupported list shall be returned.
		content:
		application/json:
		schema:
		$ref: '#/components/schemas/measJobCreation-ResponseType'
		default:
		description: Error case.
		content:
		application/json:
		schema:
		$ref: '#/components/schemas/error-ResponseType'
		get:
		summary: Read resources of measurement jobs
		description: 'With HTTP GET, resources of measurement jobs are read. The resources to be read are identified with the path component (base resource) and the query component (jobIdList) of the URI. The fields query component allows to select the resource properties to be returned.'
		parameters:
		- name: jobIdList
		in: query
		description: This parameter identifies the list of jobId to select the resources from the collection resources identified with the path component of the URI.
		required: true
		schema:
		type: array
		items:
		type: string
		responses:
		'200':
		description: 'Success case ("200 OK"). The resources identified in the request for retrieval are returned in the response message body. In case the fields query parameter is used, the selected resources are returned.'
		content:
		application/json:
		schema:
		$ref: '#/components/schemas/measJobsRetrieval-ResponseType'
		default:
		description: Error case.
		content:
		application/json:
		schema:
		$ref: '#/components/schemas/error-ResponseType'
		'/measJobs/{jobId}':
		get:
		summary: Read resource of a single measurement job
		description: 'With HTTP GET, resource of a measurement job is read. The resource to be read is identified with the path component of the URI.'
		parameters:
		- name: jobId
		in: path
		description: Identifies the measurement job to be read.
		required: true
		schema:
		$ref: '#/components/schemas/uri-Type'
		responses:
		'200':
		description: 'Success case ("200 OK"). The resource identified in the path for retrieval is returned in the response message body. '
		content:
		application/json:
		schema:
		$ref: '#/components/schemas/measJobsRetrieval-ResponseType'
		default:
		description: Error case.
		content:
		application/json:
		schema:
		$ref: '#/components/schemas/error-ResponseType'
		delete:
		summary: Delete a single measurement job
		description: The measurement job is deleted by deleting the corresponding measurement job resource. The resource to be deleted is identified with the path component of the URI.
		parameters:
		- name: jobId
		in: path
		description: Identifies the measurement job to be deleted.
		required: true
		schema:
		$ref: '#/components/schemas/uri-Type'
		responses:
		'204':
		description: Success case ("204 No Content"). The measurement job resource has been deleted. The response message body is absent.
		default:
		description: Error case.
		content:
		application/json:
		schema:
		$ref: '#/components/schemas/error-ResponseType'
		components:
		schemas:
		dateTime-Type:
		type: string
		format: date-Time
		uri-Type:
		type: string
		measJobCreation-RequestType:
		type: object
		properties:
		iOCName:
		type: string
		iOCInstanceList:
		type: array
		items:
		$ref: '#/components/schemas/uri-Type'
		measurementCategoryList:
		type: array
		items:
		type: string
		reportingMethod:
		$ref: '#/components/schemas/reportingMethod-Type'
		granularityPeriod:
		type: integer
		reportingPeriod:
		type: integer
		startTime:
		$ref: '#/components/schemas/dateTime-Type'
		stopTime:
		$ref: '#/components/schemas/dateTime-Type'
		schedule:
		$ref: '#/components/schemas/schedule-Type'
		streamTarget:
		type: string
		priority:
		$ref: '#/components/schemas/priority-Type'
		reliability:
		type: string
		measJobCreation-ResponseType:
		type: object
		properties:
		unsupportedList:
		type: array
		items:
		$ref: '#/components/schemas/unsupportedMeas-Type'
		measJobsRetrieval-ResponseType:
		type: object
		properties:
		jobInfoList:
		type: array
		items:
		$ref: '#/components/schemas/measJobInfo-ResourceType'
		error-ResponseType:
		type: object
		properties:
		error:
		type: object
		properties:
		errorInfo:
		type: string
		measJobInfo-ResourceType:
		type: object
		properties:
		href:
		$ref: '#/components/schemas/uri-Type'
		iOCName:
		type: string
		iOCInstanceList:
		type: array
		items:
		$ref: '#/components/schemas/uri-Type'
		measurementCategoryList:
		type: array
		items:
		type: string
		reportingMethod:
		$ref: '#/components/schemas/reportingMethod-Type'
		granularityPeriod:
		type: integer
		reportingPeriod:
		type: integer
		startTime:
		$ref: '#/components/schemas/dateTime-Type'
		stopTime:
		$ref: '#/components/schemas/dateTime-Type'
		schedule:
		$ref: '#/components/schemas/schedule-Type'
		streamTarget:
		type: string
		priority:
		$ref: '#/components/schemas/priority-Type'
		reliability:
		type: string
		schedule-Type:
		type: object
		properties:
		scheduleOption:
		$ref: '#/components/schemas/scheduleOption-Type'
		dailySchedule:
		type: array
		items:
		$ref: '#/components/schemas/timeInterval-Type'
		weeklySchedule:
		type: array
		items:
		$ref: '#/components/schemas/scheduleOfDay-Type'
		timeInterval-Type:
		type: object
		properties:
		intervalStart:
		type: string
		format: Time
		intervalEnd:
		type: string
		format: Time
		scheduleOfDay-Type:
		type: object
		properties:
		dayOfWeek:
		$ref: '#/components/schemas/dayOfWeek-Type'
		intervalsOfDay:
		type: array
		items:
		$ref: '#/components/schemas/timeInterval-Type'
		unsupportedMeas-Type:
		type: object
		properties:
		iOCInstance:
		$ref: '#/components/schemas/uri-Type'
		measurementTypeName:
		type: string
		reason:
		type: string
		reportingMethod-Type:
		type: string
		enum:
		- file
		- streaming
		priority-Type:
		type: string
		enum:
		- low
		- medium
		- high
		scheduleOption-Type:
		type: string
		enum:
		- daily
		- weekly
		dayOfWeek-Type:
		type: string
		enum:
		- Monday
		- Tuesday
		- Wednesday
		- Thursday
		- Friday
		- Saturday
		- Sunday

OpenAPI/nrNrm.yaml

+14 −14

Original line number	Diff line number	Diff line
		@@ -887,6 +887,20 @@ components:
		type: array
		items:
		$ref: 'comDefs.yaml#/components/schemas/Dn'
		rimRSMonitoringStartTime:
		type: string
		rimRSMonitoringStopTime:
		type: string
		rimRSMonitoringWindowDuration:
		type: integer
		rimRSMonitoringWindowStartingOffset:
		type: integer
		rimRSMonitoringWindowPeriodicity:
		type: integer
		rimRSMonitoringOccasionInterval:
		type: integer
		rimRSMonitoringOccasionStartingOffset:
		type: integer
		nRFrequencyRef:
		$ref: 'comDefs.yaml#/components/schemas/Dn'
		victimSetRef:
		@@ -1391,20 +1405,6 @@ components:
		$ref: '#/components/schemas/RSSetId'
		setType:
		$ref: '#/components/schemas/RSSetType'
		rimRSMonitoringStartTime:
		type: string
		rimRSMonitoringStopTime:
		type: string
		rimRSMonitoringWindowDuration:
		type: integer
		rimRSMonitoringWindowStartingOffset:
		type: integer
		rimRSMonitoringWindowPeriodicity:
		type: integer
		rimRSMonitoringOccasionInterval:
		type: integer
		rimRSMonitoringOccasionStartingOffset:
		type: integer
		nRCellDURefs:
		$ref: 'comDefs.yaml#/components/schemas/DnList'

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

+47 −3

Original line number	Diff line number	Diff line
		module _3gpp-5g-common-yang-types {
		yang-version 1.1;
		namespace "urn:3gpp:sa5:_3gpp-5g-common-yang-types";
		prefix "types5g3gpp";
		prefix "type5g3gpp";


		import _3gpp-common-yang-types { prefix types3gpp; }

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

		revision 2021-08-04 { reference S5-214052/CR-0517; }
		revision 2020-11-05 { reference CR-0411 ; }
		revision 2019-10-20 { reference "Initial version."; }

		@@ -71,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.";
		}

		}
		@@ -101,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;
		}