From 9d9f067b6d2c59e8496222eca869e2ef69dbb2aa Mon Sep 17 00:00:00 2001 From: allwang Date: Sun, 15 Aug 2021 21:11:39 +0200 Subject: [PATCH 01/38] Update genericNrm.yaml correct some parameter value sets of traceJob S5-214305 --- OpenAPI/genericNrm.yaml | 49 +++++++---------------------------------- 1 file changed, 8 insertions(+), 41 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index c45aad4b2..0cbcd9b72 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -616,7 +616,7 @@ components: - AUSF - SMSF - tjPLMNTaget-Type: + tjPLMNTarget-Type: type: object description: The PLMN for which sessions shall be selected in the Trace Session in case of management based activation when several PLMNs are supported in the RAN (this means that shared cells and not shared cells are allowed for the specified PLMN. Note that the PLMN Target might differ from the PLMN specified in the Trace Reference, as that specifies the PLMN that is containing the management system requesting the Trace Session from the NE. See 3GPP TS 32.422 clause 5.9b for additional details. properties: @@ -757,6 +757,7 @@ components: description: See details in 3GPP TS 32.422 clause 5.10.21. type: string enum: + - 100ms - 250ms - 500ms - 1000ms @@ -764,14 +765,6 @@ components: - 3000ms - 4000ms - 6000ms - - 8000ms - - 12000ms - - 16000ms - - 20000ms - - 24000ms - - 28000ms - - 32000ms - - 64000ms tjMDTCollectionPeriodRrmNR-Type: description: See details in 3GPP TS 32.422 clause 5.10.30. @@ -967,9 +960,7 @@ components: type: string enum: - 1024ms - - 1280ms - 2048ms - - 2560ms - 5120ms - 10240ms - 1min @@ -978,8 +969,6 @@ components: description: See details in 3GPP TS 32.422 clause 5.10.22. type: string enum: - - 250ms - - 500ms - 1000ms - 2000ms - 3000ms @@ -1002,7 +991,7 @@ components: - CPICH_RSCP - PathLoss - tjMDTPLMList-Type: + tjMDTPLMNList-Type: description: See details in 3GPP TS 32.422 clause 5.10.24. type: array items: @@ -1110,7 +1099,6 @@ components: - 360000ms - 720000ms - 1800000ms - - 3600000ms tjMDTReportType-Type: description: Report type for logged NR MDT. See details in 3GPP TS 32.422 clause 5.10.27. @@ -1130,29 +1118,8 @@ components: - UE_ORIENTATION tjMDTTraceCollectionEntityID-Type: - description: See details in 3GPP TS 32.422 clause 5.10.11. Only tceID value may be sent over the air to the UE being configured for Logged MDT. - type: object - properties: - tceID: - type: integer - tcePLMN: - type: object - properties: - mcc: - $ref: 'comDefs.yaml#/components/schemas/Mcc' - mnc: - $ref: 'comDefs.yaml#/components/schemas/Mnc' - required: - - mcc - - mnc - tceAddress: - oneOf: - - $ref: '#/components/schemas/IpAddr' - - $ref: 'comDefs.yaml#/components/schemas/Uri' - required: - - tceID - - tcePLMN - - tceAddress + description: See details in 3GPP TS 32.422 clause 5.10.11. Only TCE Id value may be sent over the air to the UE being configured for Logged MDT. + type: integer #-------- end of Definition of types used in Trace control NRM fragment ---------- @@ -1305,7 +1272,7 @@ components: tjListOfNeTypes: $ref: '#/components/schemas/tjListOfNeTypes-Type' tjPLMNTarget: - $ref: '#/components/schemas/tjPLMNTaget-Type' + $ref: '#/components/schemas/tjPLMNTarget-Type' tjStreamingTraceConsumerURI: $ref: 'comDefs.yaml#/components/schemas/Uri' tjTraceCollectionEntityAddress: @@ -1364,8 +1331,8 @@ components: $ref: '#/components/schemas/tjMDTMeasurementPeriodUMTS-Type' tjMDTMeasurementQuantity: $ref: '#/components/schemas/tjMDTMeasurementQuantity-Type' - tjMDTPLMList: - $ref: '#/components/schemas/tjMDTPLMList-Type' + tjMDTPLMNList: + $ref: '#/components/schemas/tjMDTPLMNList-Type' tjMDTPositioningMethod: $ref: '#/components/schemas/tjMDTPositioningMethod-Type' tjMDTReportAmount: -- GitLab From f4ed06c11650e46b40ba3cfe1dbd3072016faa6a Mon Sep 17 00:00:00 2001 From: yaoyiz Date: Thu, 2 Sep 2021 04:58:09 +0200 Subject: [PATCH 02/38] Add new file --- PerfMeasJobCtrlMnS.yaml | 277 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 277 insertions(+) create mode 100644 PerfMeasJobCtrlMnS.yaml diff --git a/PerfMeasJobCtrlMnS.yaml b/PerfMeasJobCtrlMnS.yaml new file mode 100644 index 000000000..50fea5a73 --- /dev/null +++ b/PerfMeasJobCtrlMnS.yaml @@ -0,0 +1,277 @@ +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 -- GitLab From c272f694b4700076db8710a62413e26a1b007d56 Mon Sep 17 00:00:00 2001 From: pingj Date: Thu, 2 Sep 2021 05:30:06 +0200 Subject: [PATCH 03/38] Revert "Merge branch '28.550_Rel16_CR0068_Correction_of_OpenAPI' into 'Integration_Rel16_SA5_138_YAML'" This reverts merge request !162 --- PerfMeasJobCtrlMnS.yaml | 277 ---------------------------------------- 1 file changed, 277 deletions(-) delete mode 100644 PerfMeasJobCtrlMnS.yaml diff --git a/PerfMeasJobCtrlMnS.yaml b/PerfMeasJobCtrlMnS.yaml deleted file mode 100644 index 50fea5a73..000000000 --- a/PerfMeasJobCtrlMnS.yaml +++ /dev/null @@ -1,277 +0,0 @@ -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 -- GitLab From 4242648f48bec704dac96c7c1ea4ade32cbd8510 Mon Sep 17 00:00:00 2001 From: pingj Date: Thu, 2 Sep 2021 03:24:43 +0000 Subject: [PATCH 04/38] Merge branch '28.550_Rel16_CR0068_Correction_of_OpenAPI' into 'Integration_Rel16_SA5_138_YAML' Add missing PerfMeasJobCtrlMnS.yaml file See merge request sa5/MnS!162 (cherry picked from commit 2b7fa8b49e0f9c07865bc24603b75b4a11b3ca57) f4ed06c1 Add new file --- PerfMeasJobCtrlMnS.yaml | 277 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 277 insertions(+) create mode 100644 PerfMeasJobCtrlMnS.yaml diff --git a/PerfMeasJobCtrlMnS.yaml b/PerfMeasJobCtrlMnS.yaml new file mode 100644 index 000000000..50fea5a73 --- /dev/null +++ b/PerfMeasJobCtrlMnS.yaml @@ -0,0 +1,277 @@ +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 -- GitLab From a153a89cad4c759a3be0d1d1fd3c6ffcfd021d46 Mon Sep 17 00:00:00 2001 From: yaoyiz Date: Thu, 2 Sep 2021 06:16:43 +0200 Subject: [PATCH 05/38] Add new file --- OpenAPI/PerfMeasJobCtrlMnS.yaml | 277 ++++++++++++++++++++++++++++++++ 1 file changed, 277 insertions(+) create mode 100644 OpenAPI/PerfMeasJobCtrlMnS.yaml diff --git a/OpenAPI/PerfMeasJobCtrlMnS.yaml b/OpenAPI/PerfMeasJobCtrlMnS.yaml new file mode 100644 index 000000000..50fea5a73 --- /dev/null +++ b/OpenAPI/PerfMeasJobCtrlMnS.yaml @@ -0,0 +1,277 @@ +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 -- GitLab From 4c15c9d922bc2ce57388129d76151f42b66b475f Mon Sep 17 00:00:00 2001 From: pingj Date: Thu, 2 Sep 2021 07:11:29 +0200 Subject: [PATCH 06/38] Delete PerfMeasJobCtrlMnS.yaml --- PerfMeasJobCtrlMnS.yaml | 277 ---------------------------------------- 1 file changed, 277 deletions(-) delete mode 100644 PerfMeasJobCtrlMnS.yaml diff --git a/PerfMeasJobCtrlMnS.yaml b/PerfMeasJobCtrlMnS.yaml deleted file mode 100644 index 50fea5a73..000000000 --- a/PerfMeasJobCtrlMnS.yaml +++ /dev/null @@ -1,277 +0,0 @@ -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 -- GitLab From 466811560e462acad58dedaf1f7a89be9fbd2843 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Aug 2021 13:32:48 +0200 Subject: [PATCH 07/38] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index ada95116b..c564b1a12 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -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' -- GitLab From 1978040216713c5e8cfe6ad3a436730ce937d1ac Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Aug 2021 13:36:33 +0200 Subject: [PATCH 08/38] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 543c2be3d..33f707a69 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -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' -- GitLab From d7c264258aae309e4e4c549c2dcd18aebcfeaec9 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Aug 2021 13:38:12 +0200 Subject: [PATCH 09/38] Update _3gpp-5gc-nrm-neffunction.yang --- yang-models/_3gpp-5gc-nrm-neffunction.yang | 4 ---- 1 file changed, 4 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index 830371f6a..c3a56501c 100755 --- a/yang-models/_3gpp-5gc-nrm-neffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang @@ -43,10 +43,6 @@ module _3gpp-5gc-nrm-neffunction { reference "3GPP TS 23.003"; type string; } - - leaf isINEF { - type boolean; - } leaf isCAPIFSup { type boolean; -- GitLab From 93aabc25a6f0e70c4299ab381cc297b6cec4d314 Mon Sep 17 00:00:00 2001 From: allwang Date: Sun, 15 Aug 2021 21:21:35 +0200 Subject: [PATCH 10/38] Update genericNrm.yaml Add missing parameters for reporting in TraceJob S5-214262 --- OpenAPI/genericNrm.yaml | 54 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index c45aad4b2..ab1c1b0e5 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -962,6 +962,46 @@ components: - 61.44s - INFINITY + tjMDTLoggingEventThreshold-Type: + description: See details in 3GPP TS 32.422 clause 5.10.X. + type: object + properties: + RSRP: + type: integer + minimum: 0 + maximum: 127 + RSRQ: + type: integer + minimum: 0 + maximum: 127 + + tjMDTLoggingHysteresis-Type: + description: See details in 3GPP TS 32.422 clause 5.10.Y. + type: integer + minimum: 0 + maximum: 30 + + tjMDTLoggingTimeToTrigger-Type: + description: See details in 3GPP TS 32.422 clause 5.10.Z. + type: string + enum: + - 0ms + - 40ms + - 64ms + - 80ms + - 100ms + - 128ms + - 160ms + - 256ms + - 320ms + - 480ms + - 512ms + - 640ms + - 1024ms + - 1280ms + - 2560ms + - 5120ms + tjMDTMeasurementPeriodLTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.23. type: string @@ -1002,6 +1042,12 @@ components: - CPICH_RSCP - PathLoss + tjMDTM4ThresholdUmts-Type: + description: See details in 3GPP TS 32.422 clause 5.10.A. + type: integer + minimum: 0 + maximum: 31 + tjMDTPLMList-Type: description: See details in 3GPP TS 32.422 clause 5.10.24. type: array @@ -1354,6 +1400,12 @@ components: $ref: '#/components/schemas/tjMDTLoggingDuration-Type' tjMDTLoggingInterval: $ref: '#/components/schemas/tjMDTLoggingInterval-Type' + tjMDTLoggingEventThreshold: + $ref: '#/components/schemas/tjMDTLoggingEventThreshold-Type' + tjMDTLoggingHysteresis: + $ref: '#/components/schemas/tjMDTLoggingHysteresis-Type' + tjMDTLoggingTimeToTrigger: + $ref: '#/components/schemas/tjMDTLoggingTimeToTrigger-Type' tjMDTMBSFNAreaList: type: array items: @@ -1364,6 +1416,8 @@ components: $ref: '#/components/schemas/tjMDTMeasurementPeriodUMTS-Type' tjMDTMeasurementQuantity: $ref: '#/components/schemas/tjMDTMeasurementQuantity-Type' + tjMDTM4ThresholdUmts: + $ref: '#/components/schemas/tjMDTM4ThresholdUmts-Type' tjMDTPLMList: $ref: '#/components/schemas/tjMDTPLMList-Type' tjMDTPositioningMethod: -- GitLab From 6a9c824a268ee90b32713b47a95381e761cf0ab3 Mon Sep 17 00:00:00 2001 From: allwang Date: Sun, 15 Aug 2021 21:22:36 +0200 Subject: [PATCH 11/38] Update genericNrm.yaml Add missing parameters for reporting in TraceJob S5-214262 --- OpenAPI/genericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index ab1c1b0e5..b81bb2f69 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -965,7 +965,7 @@ components: tjMDTLoggingEventThreshold-Type: description: See details in 3GPP TS 32.422 clause 5.10.X. type: object - properties: + properties: RSRP: type: integer minimum: 0 -- GitLab From 7dcdc878c7c3c8a06884fa407e538f8ccba2ed87 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 17 Aug 2021 02:47:42 +0200 Subject: [PATCH 12/38] Fix the issue caused by the updated NetworkSliceSubnet inheritence relationship --- OpenAPI/sliceNrm.yaml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 81a86cc0f..7f7d36b9c 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -341,7 +341,6 @@ components: $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' serviceProfileList: $ref: '#/components/schemas/ServiceProfileList' - NetworkSliceSubnet-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' @@ -365,7 +364,18 @@ components: $ref: '#/components/schemas/SliceProfileList' epTransportRefList: $ref: 'comDefs.yaml#/components/schemas/DnList' - + priorityLabel: + type: integer + PerfMetricJob: + $ref: 'genericNrm.yaml#/components/schemas/PerfMetricJob-Multiple' + ThresholdMonitor: + $ref: 'genericNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' + NtfSubscriptionControl: + $ref: 'genericNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' + TraceJob: + $ref: 'genericNrm.yaml#/components/schemas/TraceJob-Multiple' + AlarmList: + $ref: 'genericNrm.yaml#/components/schemas/AlarmList-Single' EP_Transport-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' -- GitLab From 05464a84405aed563bff60ec6fcfb2a293630f32 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 24 Aug 2021 13:27:36 +0200 Subject: [PATCH 13/38] Update sliceNrm.yaml to remove AlarmList --- OpenAPI/sliceNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 7f7d36b9c..7e12c24a1 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -374,8 +374,6 @@ components: $ref: 'genericNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' TraceJob: $ref: 'genericNrm.yaml#/components/schemas/TraceJob-Multiple' - AlarmList: - $ref: 'genericNrm.yaml#/components/schemas/AlarmList-Single' EP_Transport-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' -- GitLab From a30df7b1ee1123fe0f4633eb67ec26ac1eb60b93 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 31 Aug 2021 06:04:24 +0200 Subject: [PATCH 14/38] Update sliceNrm.yaml to remove the XXX control IOC name contained by NetworkSliceSubnet --- OpenAPI/sliceNrm.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 7e12c24a1..87c5e5794 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -366,14 +366,6 @@ components: $ref: 'comDefs.yaml#/components/schemas/DnList' priorityLabel: type: integer - PerfMetricJob: - $ref: 'genericNrm.yaml#/components/schemas/PerfMetricJob-Multiple' - ThresholdMonitor: - $ref: 'genericNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - NtfSubscriptionControl: - $ref: 'genericNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' - TraceJob: - $ref: 'genericNrm.yaml#/components/schemas/TraceJob-Multiple' EP_Transport-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' -- GitLab From d34481bdd8f7c2208e66a3a94131feae85a4b7a3 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Aug 2021 12:11:42 +0200 Subject: [PATCH 15/38] Update nrNrm.yaml, replace Top-Attr with Top --- OpenAPI/nrNrm.yaml | 86 +++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index c564b1a12..4ab010230 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -583,7 +583,7 @@ components: SubNetwork-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -624,7 +624,7 @@ components: ManagedElement-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -657,7 +657,7 @@ components: GnbDuFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -694,7 +694,7 @@ components: $ref: '#/components/schemas/DRACHOptimizationFunction-Single' GnbCuUpFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -733,7 +733,7 @@ components: $ref: '#/components/schemas/EP_S1U-Multiple' GnbCuCpFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -793,7 +793,7 @@ components: NrCellCu-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -831,7 +831,7 @@ components: NrCellDu-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -919,7 +919,7 @@ components: NRFrequency-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -937,7 +937,7 @@ components: maximum: 256 EUtranFrequency-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -954,7 +954,7 @@ components: NrSectorCarrier-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -983,7 +983,7 @@ components: $ref: '#/components/schemas/CommonBeamformingFunction-Single' Bwp-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1006,7 +1006,7 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' CommonBeamformingFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1025,7 +1025,7 @@ components: $ref: '#/components/schemas/Beam-Multiple' Beam-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1056,7 +1056,7 @@ components: maximum: 1800 RRMPolicyRatio-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1073,7 +1073,7 @@ components: NRCellRelation-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1097,7 +1097,7 @@ components: type: boolean EUtranCellRelation-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1110,7 +1110,7 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' NRFreqRelation-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1173,7 +1173,7 @@ components: $ref: 'comDefs.yaml#/components/schemas/Dn' EUtranFreqRelation-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1236,7 +1236,7 @@ components: $ref: 'comDefs.yaml#/components/schemas/Dn' DANRManagementFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1249,7 +1249,7 @@ components: DESManagementFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1284,7 +1284,7 @@ components: DRACHOptimizationFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1300,7 +1300,7 @@ components: DMROFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1317,7 +1317,7 @@ components: DPCIConfigurationFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1330,7 +1330,7 @@ components: CPCIConfigurationFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1343,7 +1343,7 @@ components: CESManagementFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1378,7 +1378,7 @@ components: RimRSGlobal-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1395,7 +1395,7 @@ components: RimRSSet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1410,7 +1410,7 @@ components: ExternalGnbDuFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1431,7 +1431,7 @@ components: $ref: '#/components/schemas/EP_F1U-Multiple' ExternalGnbCuUpFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1454,7 +1454,7 @@ components: $ref: '#/components/schemas/EP_XnU-Multiple' ExternalGnbCuCpFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1482,7 +1482,7 @@ components: $ref: '#/components/schemas/EP_F1C-Multiple' ExternalNrCellCu-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1501,7 +1501,7 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' ExternalENBFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1518,7 +1518,7 @@ components: $ref: '#/components/schemas/ExternalEUTranCell-Multiple' ExternalEUTranCell-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1532,7 +1532,7 @@ components: EP_XnC-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1546,7 +1546,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_E1-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1560,7 +1560,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_F1C-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1574,7 +1574,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_NgC-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1588,7 +1588,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_X2C-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1602,7 +1602,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_XnU-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1616,7 +1616,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_F1U-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1630,7 +1630,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_NgU-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1647,7 +1647,7 @@ components: EP_X2U-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1661,7 +1661,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_S1U-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: -- GitLab From 124f10e5266635aa7d2708d7bd7e632146202963 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Aug 2021 12:20:11 +0200 Subject: [PATCH 16/38] Update OpenAPI/5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 122 ++++++++++++++++++++++---------------------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 33f707a69..777e2fab9 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -441,7 +441,7 @@ components: SubNetwork-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -471,7 +471,7 @@ components: ManagedElement-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -523,7 +523,7 @@ components: AmfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -576,7 +576,7 @@ components: $ref: '#/components/schemas/EP_NLG-Multiple' AmfSet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -594,7 +594,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' AmfRegion-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -612,7 +612,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' SmfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -663,7 +663,7 @@ components: UpfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -696,7 +696,7 @@ components: $ref: '#/components/schemas/EP_S5U-Multiple' N3iwfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -717,7 +717,7 @@ components: $ref: '#/components/schemas/EP_N4-Multiple' PcfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -758,7 +758,7 @@ components: AusfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -785,7 +785,7 @@ components: $ref: '#/components/schemas/EP_N13-Multiple' UdmFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -814,7 +814,7 @@ components: $ref: '#/components/schemas/EP_N13-Multiple' UdrFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -832,7 +832,7 @@ components: $ref: '#/components/schemas/ManagedNFProfile' UdsfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -850,7 +850,7 @@ components: $ref: '#/components/schemas/ManagedNFProfile' NrfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -875,7 +875,7 @@ components: $ref: '#/components/schemas/EP_N27-Multiple' NssfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -904,7 +904,7 @@ components: $ref: '#/components/schemas/EP_N31-Multiple' SmsfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -931,7 +931,7 @@ components: $ref: '#/components/schemas/EP_MAP_SMSC-Multiple' LmfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -952,7 +952,7 @@ components: $ref: '#/components/schemas/EP_NLS-Multiple' NgeirFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -977,7 +977,7 @@ components: $ref: '#/components/schemas/EP_N17-Multiple' SeppFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1000,7 +1000,7 @@ components: $ref: '#/components/schemas/EP_N32-Multiple' NwdafFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1020,7 +1020,7 @@ components: $ref: '#/components/schemas/CommModelList' ScpFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1035,7 +1035,7 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' NefFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1057,7 +1057,7 @@ components: ExternalAmfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1071,7 +1071,7 @@ components: $ref: '#/components/schemas/AmfIdentifier' ExternalNrfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1083,7 +1083,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList' ExternalNssfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1095,7 +1095,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList' ExternalSeppFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1113,7 +1113,7 @@ components: EP_N2-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1127,7 +1127,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N3-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1143,7 +1143,7 @@ components: $ref: 'comDefs.yaml#/components/schemas/DnList' EP_N4-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1157,7 +1157,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N5-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1171,7 +1171,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N6-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1185,7 +1185,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N7-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1199,7 +1199,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N8-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1213,7 +1213,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N9-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1227,7 +1227,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N10-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1241,7 +1241,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N11-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1255,7 +1255,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N12-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1269,7 +1269,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N13-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1283,7 +1283,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N14-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1297,7 +1297,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N15-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1311,7 +1311,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N16-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1325,7 +1325,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N17-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1340,7 +1340,7 @@ components: EP_N20-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1355,7 +1355,7 @@ components: EP_N21-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1369,7 +1369,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N22-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1384,7 +1384,7 @@ components: EP_N26-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1398,7 +1398,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N27-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1414,7 +1414,7 @@ components: EP_N31-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1428,7 +1428,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N32-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1451,7 +1451,7 @@ components: EP_S5C-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1465,7 +1465,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_S5U-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1479,7 +1479,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_Rx-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1493,7 +1493,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_MAP_SMSC-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1507,7 +1507,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_NLS-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1521,7 +1521,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_NLG-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1536,7 +1536,7 @@ components: FiveQiDscpMappingSet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1550,7 +1550,7 @@ components: Configurable5QISet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1564,7 +1564,7 @@ components: Dynamic5QISet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1578,7 +1578,7 @@ components: GtpUPathQoSMonitoringControl-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1615,7 +1615,7 @@ components: QFQoSMonitoringControl-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1652,7 +1652,7 @@ components: PredefinedPccRuleSet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: -- GitLab From b50ea60f14cacac6279fa00672da3500e8a113d7 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Aug 2021 13:07:48 +0200 Subject: [PATCH 17/38] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 87c5e5794..0a601aa46 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -306,7 +306,7 @@ components: SubNetwork-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -326,7 +326,7 @@ components: NetworkSlice-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -343,7 +343,7 @@ components: $ref: '#/components/schemas/ServiceProfileList' NetworkSliceSubnet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -368,7 +368,7 @@ components: type: integer EP_Transport-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: -- GitLab From 11d738652c4a0cdf0c02e8a22ce4f8c92c0d26ea Mon Sep 17 00:00:00 2001 From: pollakowskio Date: Wed, 25 Aug 2021 07:20:40 +0200 Subject: [PATCH 18/38] Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index cdfa486d4..b48192857 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1571,7 +1571,7 @@ components: scope: $ref: '#/components/schemas/Scope' notificationFilter: - type: string + $ref: 'comDefs.yaml#/components/schemas/Filter' HeartbeatControl: $ref: '#/components/schemas/HeartbeatControl-Single' HeartbeatControl-Single: @@ -1584,6 +1584,7 @@ components: properties: heartbeatNtfPeriod: type: integer + minimum: 0 triggerHeartbeatNtf: type: boolean TraceJob-Single: -- GitLab From 5e1708743ff90755d874a532500b661983b97037 Mon Sep 17 00:00:00 2001 From: pollakowskio Date: Wed, 25 Aug 2021 07:39:11 +0200 Subject: [PATCH 19/38] Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index b48192857..d49758e3b 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1180,15 +1180,29 @@ components: properties: id: type: string + nullable: true + objectClass: + type: string + objectInstance: + $ref: 'comDefs.yaml#/components/schemas/Dn' VsDataContainer: $ref: '#/components/schemas/VsDataContainer-Multiple' + required: + - id Top: type: object properties: id: type: string + nullable: true + objectClass: + type: string + objectInstance: + $ref: 'comDefs.yaml#/components/schemas/Dn' VsDataContainer: $ref: '#/components/schemas/VsDataContainer-Multiple' + required: + - id #-------- Definition of IOCs with new name-containments defined in other TS ------ -- GitLab From 1249bb4c1ee14087de84e5b42e5340709fbc8c3d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 22 Sep 2021 03:04:26 +0200 Subject: [PATCH 20/38] Update version of nrNrm.yaml --- OpenAPI/nrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 4ab010230..ef221ec58 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 16.9.0 + version: 16.10.0 description: >- OAS 3.0.1 specification of the NR NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From a8f8c50c391f8938e7dc0bdce314b19c42bbb021 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 22 Sep 2021 03:19:43 +0200 Subject: [PATCH 21/38] Update version of 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 777e2fab9..8025144d8 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 16.9.0 + version: 16.10.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 155d002e9a48f82e331f2051baf8828d2c850df8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 22 Sep 2021 03:20:16 +0200 Subject: [PATCH 22/38] Update version of sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 0a601aa46..2b155183c 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 16.9.0 + version: 16.10.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 6630f210c03cc61e5556eda7fd48cac3c7698b56 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 22 Sep 2021 04:20:11 +0200 Subject: [PATCH 23/38] Update version of genericNrm.yaml (from 16.8.0 --> 16.9.0) --- OpenAPI/genericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index d49758e3b..5bfacad52 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Generic NRM - version: 16.8.0 + version: 16.9.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From aed34f75ba1dcbc69b179c11a84cd64024361ccf Mon Sep 17 00:00:00 2001 From: allwang Date: Sun, 15 Aug 2021 21:21:35 +0200 Subject: [PATCH 24/38] Update genericNrm.yaml Add missing parameters for reporting in TraceJob S5-214262 --- OpenAPI/genericNrm.yaml | 54 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index c45aad4b2..ab1c1b0e5 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -962,6 +962,46 @@ components: - 61.44s - INFINITY + tjMDTLoggingEventThreshold-Type: + description: See details in 3GPP TS 32.422 clause 5.10.X. + type: object + properties: + RSRP: + type: integer + minimum: 0 + maximum: 127 + RSRQ: + type: integer + minimum: 0 + maximum: 127 + + tjMDTLoggingHysteresis-Type: + description: See details in 3GPP TS 32.422 clause 5.10.Y. + type: integer + minimum: 0 + maximum: 30 + + tjMDTLoggingTimeToTrigger-Type: + description: See details in 3GPP TS 32.422 clause 5.10.Z. + type: string + enum: + - 0ms + - 40ms + - 64ms + - 80ms + - 100ms + - 128ms + - 160ms + - 256ms + - 320ms + - 480ms + - 512ms + - 640ms + - 1024ms + - 1280ms + - 2560ms + - 5120ms + tjMDTMeasurementPeriodLTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.23. type: string @@ -1002,6 +1042,12 @@ components: - CPICH_RSCP - PathLoss + tjMDTM4ThresholdUmts-Type: + description: See details in 3GPP TS 32.422 clause 5.10.A. + type: integer + minimum: 0 + maximum: 31 + tjMDTPLMList-Type: description: See details in 3GPP TS 32.422 clause 5.10.24. type: array @@ -1354,6 +1400,12 @@ components: $ref: '#/components/schemas/tjMDTLoggingDuration-Type' tjMDTLoggingInterval: $ref: '#/components/schemas/tjMDTLoggingInterval-Type' + tjMDTLoggingEventThreshold: + $ref: '#/components/schemas/tjMDTLoggingEventThreshold-Type' + tjMDTLoggingHysteresis: + $ref: '#/components/schemas/tjMDTLoggingHysteresis-Type' + tjMDTLoggingTimeToTrigger: + $ref: '#/components/schemas/tjMDTLoggingTimeToTrigger-Type' tjMDTMBSFNAreaList: type: array items: @@ -1364,6 +1416,8 @@ components: $ref: '#/components/schemas/tjMDTMeasurementPeriodUMTS-Type' tjMDTMeasurementQuantity: $ref: '#/components/schemas/tjMDTMeasurementQuantity-Type' + tjMDTM4ThresholdUmts: + $ref: '#/components/schemas/tjMDTM4ThresholdUmts-Type' tjMDTPLMList: $ref: '#/components/schemas/tjMDTPLMList-Type' tjMDTPositioningMethod: -- GitLab From ab77602570cd203883c0643807bb661e4f37579f Mon Sep 17 00:00:00 2001 From: allwang Date: Sun, 15 Aug 2021 21:22:36 +0200 Subject: [PATCH 25/38] Update genericNrm.yaml Add missing parameters for reporting in TraceJob S5-214262 --- OpenAPI/genericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index ab1c1b0e5..b81bb2f69 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -965,7 +965,7 @@ components: tjMDTLoggingEventThreshold-Type: description: See details in 3GPP TS 32.422 clause 5.10.X. type: object - properties: + properties: RSRP: type: integer minimum: 0 -- GitLab From 1484a5647be8eca1300c3bb29bd49c60ec1fb395 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 17 Aug 2021 02:47:42 +0200 Subject: [PATCH 26/38] Fix the issue caused by the updated NetworkSliceSubnet inheritence relationship --- OpenAPI/sliceNrm.yaml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 81a86cc0f..7f7d36b9c 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -341,7 +341,6 @@ components: $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' serviceProfileList: $ref: '#/components/schemas/ServiceProfileList' - NetworkSliceSubnet-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' @@ -365,7 +364,18 @@ components: $ref: '#/components/schemas/SliceProfileList' epTransportRefList: $ref: 'comDefs.yaml#/components/schemas/DnList' - + priorityLabel: + type: integer + PerfMetricJob: + $ref: 'genericNrm.yaml#/components/schemas/PerfMetricJob-Multiple' + ThresholdMonitor: + $ref: 'genericNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' + NtfSubscriptionControl: + $ref: 'genericNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' + TraceJob: + $ref: 'genericNrm.yaml#/components/schemas/TraceJob-Multiple' + AlarmList: + $ref: 'genericNrm.yaml#/components/schemas/AlarmList-Single' EP_Transport-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' -- GitLab From 08d1dddd5f2aa3f6b6cf008dc9ca934e03845847 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 24 Aug 2021 13:27:36 +0200 Subject: [PATCH 27/38] Update sliceNrm.yaml to remove AlarmList --- OpenAPI/sliceNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 7f7d36b9c..7e12c24a1 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -374,8 +374,6 @@ components: $ref: 'genericNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' TraceJob: $ref: 'genericNrm.yaml#/components/schemas/TraceJob-Multiple' - AlarmList: - $ref: 'genericNrm.yaml#/components/schemas/AlarmList-Single' EP_Transport-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' -- GitLab From 3525769eaf0fa238815da037b1830b89bc76812a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 31 Aug 2021 06:04:24 +0200 Subject: [PATCH 28/38] Update sliceNrm.yaml to remove the XXX control IOC name contained by NetworkSliceSubnet --- OpenAPI/sliceNrm.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 7e12c24a1..87c5e5794 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -366,14 +366,6 @@ components: $ref: 'comDefs.yaml#/components/schemas/DnList' priorityLabel: type: integer - PerfMetricJob: - $ref: 'genericNrm.yaml#/components/schemas/PerfMetricJob-Multiple' - ThresholdMonitor: - $ref: 'genericNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - NtfSubscriptionControl: - $ref: 'genericNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' - TraceJob: - $ref: 'genericNrm.yaml#/components/schemas/TraceJob-Multiple' EP_Transport-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' -- GitLab From 13095062a25c056aa24a7705e36e6934eed830dd Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Aug 2021 12:11:42 +0200 Subject: [PATCH 29/38] Update nrNrm.yaml, replace Top-Attr with Top --- OpenAPI/nrNrm.yaml | 86 +++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index c564b1a12..4ab010230 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -583,7 +583,7 @@ components: SubNetwork-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -624,7 +624,7 @@ components: ManagedElement-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -657,7 +657,7 @@ components: GnbDuFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -694,7 +694,7 @@ components: $ref: '#/components/schemas/DRACHOptimizationFunction-Single' GnbCuUpFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -733,7 +733,7 @@ components: $ref: '#/components/schemas/EP_S1U-Multiple' GnbCuCpFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -793,7 +793,7 @@ components: NrCellCu-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -831,7 +831,7 @@ components: NrCellDu-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -919,7 +919,7 @@ components: NRFrequency-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -937,7 +937,7 @@ components: maximum: 256 EUtranFrequency-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -954,7 +954,7 @@ components: NrSectorCarrier-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -983,7 +983,7 @@ components: $ref: '#/components/schemas/CommonBeamformingFunction-Single' Bwp-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1006,7 +1006,7 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' CommonBeamformingFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1025,7 +1025,7 @@ components: $ref: '#/components/schemas/Beam-Multiple' Beam-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1056,7 +1056,7 @@ components: maximum: 1800 RRMPolicyRatio-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1073,7 +1073,7 @@ components: NRCellRelation-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1097,7 +1097,7 @@ components: type: boolean EUtranCellRelation-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1110,7 +1110,7 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' NRFreqRelation-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1173,7 +1173,7 @@ components: $ref: 'comDefs.yaml#/components/schemas/Dn' EUtranFreqRelation-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1236,7 +1236,7 @@ components: $ref: 'comDefs.yaml#/components/schemas/Dn' DANRManagementFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1249,7 +1249,7 @@ components: DESManagementFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1284,7 +1284,7 @@ components: DRACHOptimizationFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1300,7 +1300,7 @@ components: DMROFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1317,7 +1317,7 @@ components: DPCIConfigurationFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1330,7 +1330,7 @@ components: CPCIConfigurationFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1343,7 +1343,7 @@ components: CESManagementFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1378,7 +1378,7 @@ components: RimRSGlobal-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1395,7 +1395,7 @@ components: RimRSSet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1410,7 +1410,7 @@ components: ExternalGnbDuFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1431,7 +1431,7 @@ components: $ref: '#/components/schemas/EP_F1U-Multiple' ExternalGnbCuUpFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1454,7 +1454,7 @@ components: $ref: '#/components/schemas/EP_XnU-Multiple' ExternalGnbCuCpFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1482,7 +1482,7 @@ components: $ref: '#/components/schemas/EP_F1C-Multiple' ExternalNrCellCu-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1501,7 +1501,7 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' ExternalENBFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1518,7 +1518,7 @@ components: $ref: '#/components/schemas/ExternalEUTranCell-Multiple' ExternalEUTranCell-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1532,7 +1532,7 @@ components: EP_XnC-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1546,7 +1546,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_E1-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1560,7 +1560,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_F1C-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1574,7 +1574,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_NgC-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1588,7 +1588,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_X2C-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1602,7 +1602,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_XnU-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1616,7 +1616,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_F1U-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1630,7 +1630,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_NgU-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1647,7 +1647,7 @@ components: EP_X2U-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1661,7 +1661,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_S1U-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: -- GitLab From d4947386e62c74a9331f39250a44cc3178e95e25 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Aug 2021 12:20:11 +0200 Subject: [PATCH 30/38] Update OpenAPI/5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 122 ++++++++++++++++++++++---------------------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 33f707a69..777e2fab9 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -441,7 +441,7 @@ components: SubNetwork-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -471,7 +471,7 @@ components: ManagedElement-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -523,7 +523,7 @@ components: AmfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -576,7 +576,7 @@ components: $ref: '#/components/schemas/EP_NLG-Multiple' AmfSet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -594,7 +594,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' AmfRegion-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -612,7 +612,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' SmfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -663,7 +663,7 @@ components: UpfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -696,7 +696,7 @@ components: $ref: '#/components/schemas/EP_S5U-Multiple' N3iwfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -717,7 +717,7 @@ components: $ref: '#/components/schemas/EP_N4-Multiple' PcfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -758,7 +758,7 @@ components: AusfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -785,7 +785,7 @@ components: $ref: '#/components/schemas/EP_N13-Multiple' UdmFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -814,7 +814,7 @@ components: $ref: '#/components/schemas/EP_N13-Multiple' UdrFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -832,7 +832,7 @@ components: $ref: '#/components/schemas/ManagedNFProfile' UdsfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -850,7 +850,7 @@ components: $ref: '#/components/schemas/ManagedNFProfile' NrfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -875,7 +875,7 @@ components: $ref: '#/components/schemas/EP_N27-Multiple' NssfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -904,7 +904,7 @@ components: $ref: '#/components/schemas/EP_N31-Multiple' SmsfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -931,7 +931,7 @@ components: $ref: '#/components/schemas/EP_MAP_SMSC-Multiple' LmfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -952,7 +952,7 @@ components: $ref: '#/components/schemas/EP_NLS-Multiple' NgeirFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -977,7 +977,7 @@ components: $ref: '#/components/schemas/EP_N17-Multiple' SeppFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1000,7 +1000,7 @@ components: $ref: '#/components/schemas/EP_N32-Multiple' NwdafFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1020,7 +1020,7 @@ components: $ref: '#/components/schemas/CommModelList' ScpFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1035,7 +1035,7 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' NefFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1057,7 +1057,7 @@ components: ExternalAmfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1071,7 +1071,7 @@ components: $ref: '#/components/schemas/AmfIdentifier' ExternalNrfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1083,7 +1083,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList' ExternalNssfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1095,7 +1095,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList' ExternalSeppFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1113,7 +1113,7 @@ components: EP_N2-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1127,7 +1127,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N3-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1143,7 +1143,7 @@ components: $ref: 'comDefs.yaml#/components/schemas/DnList' EP_N4-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1157,7 +1157,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N5-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1171,7 +1171,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N6-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1185,7 +1185,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N7-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1199,7 +1199,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N8-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1213,7 +1213,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N9-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1227,7 +1227,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N10-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1241,7 +1241,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N11-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1255,7 +1255,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N12-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1269,7 +1269,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N13-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1283,7 +1283,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N14-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1297,7 +1297,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N15-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1311,7 +1311,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N16-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1325,7 +1325,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N17-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1340,7 +1340,7 @@ components: EP_N20-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1355,7 +1355,7 @@ components: EP_N21-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1369,7 +1369,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N22-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1384,7 +1384,7 @@ components: EP_N26-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1398,7 +1398,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N27-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1414,7 +1414,7 @@ components: EP_N31-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1428,7 +1428,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N32-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1451,7 +1451,7 @@ components: EP_S5C-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1465,7 +1465,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_S5U-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1479,7 +1479,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_Rx-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1493,7 +1493,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_MAP_SMSC-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1507,7 +1507,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_NLS-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1521,7 +1521,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_NLG-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1536,7 +1536,7 @@ components: FiveQiDscpMappingSet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1550,7 +1550,7 @@ components: Configurable5QISet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1564,7 +1564,7 @@ components: Dynamic5QISet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1578,7 +1578,7 @@ components: GtpUPathQoSMonitoringControl-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1615,7 +1615,7 @@ components: QFQoSMonitoringControl-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1652,7 +1652,7 @@ components: PredefinedPccRuleSet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: -- GitLab From 8247f3252975704901413405a786dfd84ae79b79 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Aug 2021 13:07:48 +0200 Subject: [PATCH 31/38] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 87c5e5794..0a601aa46 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -306,7 +306,7 @@ components: SubNetwork-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -326,7 +326,7 @@ components: NetworkSlice-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -343,7 +343,7 @@ components: $ref: '#/components/schemas/ServiceProfileList' NetworkSliceSubnet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -368,7 +368,7 @@ components: type: integer EP_Transport-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: -- GitLab From 55f4919e726b1335491dbce5b9c1c1c5d4c3cfc3 Mon Sep 17 00:00:00 2001 From: allwang Date: Sun, 15 Aug 2021 21:11:39 +0200 Subject: [PATCH 32/38] Update genericNrm.yaml correct some parameter value sets of traceJob S5-214305 --- OpenAPI/genericNrm.yaml | 49 +++++++---------------------------------- 1 file changed, 8 insertions(+), 41 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index b81bb2f69..cdfa486d4 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -616,7 +616,7 @@ components: - AUSF - SMSF - tjPLMNTaget-Type: + tjPLMNTarget-Type: type: object description: The PLMN for which sessions shall be selected in the Trace Session in case of management based activation when several PLMNs are supported in the RAN (this means that shared cells and not shared cells are allowed for the specified PLMN. Note that the PLMN Target might differ from the PLMN specified in the Trace Reference, as that specifies the PLMN that is containing the management system requesting the Trace Session from the NE. See 3GPP TS 32.422 clause 5.9b for additional details. properties: @@ -757,6 +757,7 @@ components: description: See details in 3GPP TS 32.422 clause 5.10.21. type: string enum: + - 100ms - 250ms - 500ms - 1000ms @@ -764,14 +765,6 @@ components: - 3000ms - 4000ms - 6000ms - - 8000ms - - 12000ms - - 16000ms - - 20000ms - - 24000ms - - 28000ms - - 32000ms - - 64000ms tjMDTCollectionPeriodRrmNR-Type: description: See details in 3GPP TS 32.422 clause 5.10.30. @@ -1007,9 +1000,7 @@ components: type: string enum: - 1024ms - - 1280ms - 2048ms - - 2560ms - 5120ms - 10240ms - 1min @@ -1018,8 +1009,6 @@ components: description: See details in 3GPP TS 32.422 clause 5.10.22. type: string enum: - - 250ms - - 500ms - 1000ms - 2000ms - 3000ms @@ -1048,7 +1037,7 @@ components: minimum: 0 maximum: 31 - tjMDTPLMList-Type: + tjMDTPLMNList-Type: description: See details in 3GPP TS 32.422 clause 5.10.24. type: array items: @@ -1156,7 +1145,6 @@ components: - 360000ms - 720000ms - 1800000ms - - 3600000ms tjMDTReportType-Type: description: Report type for logged NR MDT. See details in 3GPP TS 32.422 clause 5.10.27. @@ -1176,29 +1164,8 @@ components: - UE_ORIENTATION tjMDTTraceCollectionEntityID-Type: - description: See details in 3GPP TS 32.422 clause 5.10.11. Only tceID value may be sent over the air to the UE being configured for Logged MDT. - type: object - properties: - tceID: - type: integer - tcePLMN: - type: object - properties: - mcc: - $ref: 'comDefs.yaml#/components/schemas/Mcc' - mnc: - $ref: 'comDefs.yaml#/components/schemas/Mnc' - required: - - mcc - - mnc - tceAddress: - oneOf: - - $ref: '#/components/schemas/IpAddr' - - $ref: 'comDefs.yaml#/components/schemas/Uri' - required: - - tceID - - tcePLMN - - tceAddress + description: See details in 3GPP TS 32.422 clause 5.10.11. Only TCE Id value may be sent over the air to the UE being configured for Logged MDT. + type: integer #-------- end of Definition of types used in Trace control NRM fragment ---------- @@ -1351,7 +1318,7 @@ components: tjListOfNeTypes: $ref: '#/components/schemas/tjListOfNeTypes-Type' tjPLMNTarget: - $ref: '#/components/schemas/tjPLMNTaget-Type' + $ref: '#/components/schemas/tjPLMNTarget-Type' tjStreamingTraceConsumerURI: $ref: 'comDefs.yaml#/components/schemas/Uri' tjTraceCollectionEntityAddress: @@ -1418,8 +1385,8 @@ components: $ref: '#/components/schemas/tjMDTMeasurementQuantity-Type' tjMDTM4ThresholdUmts: $ref: '#/components/schemas/tjMDTM4ThresholdUmts-Type' - tjMDTPLMList: - $ref: '#/components/schemas/tjMDTPLMList-Type' + tjMDTPLMNList: + $ref: '#/components/schemas/tjMDTPLMNList-Type' tjMDTPositioningMethod: $ref: '#/components/schemas/tjMDTPositioningMethod-Type' tjMDTReportAmount: -- GitLab From f1aae6e73b09e222efdf93c7daa5798e641ce18d Mon Sep 17 00:00:00 2001 From: pollakowskio Date: Wed, 25 Aug 2021 07:20:40 +0200 Subject: [PATCH 33/38] Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index cdfa486d4..b48192857 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1571,7 +1571,7 @@ components: scope: $ref: '#/components/schemas/Scope' notificationFilter: - type: string + $ref: 'comDefs.yaml#/components/schemas/Filter' HeartbeatControl: $ref: '#/components/schemas/HeartbeatControl-Single' HeartbeatControl-Single: @@ -1584,6 +1584,7 @@ components: properties: heartbeatNtfPeriod: type: integer + minimum: 0 triggerHeartbeatNtf: type: boolean TraceJob-Single: -- GitLab From ededd43ecc9550ba27f258d3dee823a3d8bfbdab Mon Sep 17 00:00:00 2001 From: pollakowskio Date: Wed, 25 Aug 2021 07:39:11 +0200 Subject: [PATCH 34/38] Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index b48192857..d49758e3b 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1180,15 +1180,29 @@ components: properties: id: type: string + nullable: true + objectClass: + type: string + objectInstance: + $ref: 'comDefs.yaml#/components/schemas/Dn' VsDataContainer: $ref: '#/components/schemas/VsDataContainer-Multiple' + required: + - id Top: type: object properties: id: type: string + nullable: true + objectClass: + type: string + objectInstance: + $ref: 'comDefs.yaml#/components/schemas/Dn' VsDataContainer: $ref: '#/components/schemas/VsDataContainer-Multiple' + required: + - id #-------- Definition of IOCs with new name-containments defined in other TS ------ -- GitLab From 5c6ec0fd5be85ce0b7b6aef56b097b0767d53e11 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 22 Sep 2021 03:04:26 +0200 Subject: [PATCH 35/38] Update version of nrNrm.yaml --- OpenAPI/nrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 4ab010230..ef221ec58 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 16.9.0 + version: 16.10.0 description: >- OAS 3.0.1 specification of the NR NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 9a7acdc2730a3d1f36afce0f37b9047532441982 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 22 Sep 2021 03:19:43 +0200 Subject: [PATCH 36/38] Update version of 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 777e2fab9..8025144d8 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 16.9.0 + version: 16.10.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 81b3e7fb7ebde7b9d93253e40853983bd37fb7c5 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 22 Sep 2021 03:20:16 +0200 Subject: [PATCH 37/38] Update version of sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 0a601aa46..2b155183c 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 16.9.0 + version: 16.10.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 2267a2cb74327695b667f8067bcdc8cf6222a93d Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 22 Sep 2021 04:20:11 +0200 Subject: [PATCH 38/38] Update version of genericNrm.yaml (from 16.8.0 --> 16.9.0) --- OpenAPI/genericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index d49758e3b..5bfacad52 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Generic NRM - version: 16.8.0 + version: 16.9.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab