From c2d114917f50329a9af0019b5b71dd0fccdaf6ea Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 28 Sep 2023 10:31:41 +0000 Subject: [PATCH 1/2] Rel18_TS28.623_Add_NRM_fragments_for_scheduler_and_condition_monitor --- OpenAPI/TS28623_ComDefs.yaml | 46 +++++++++++++++--- OpenAPI/TS28623_GenericNrm.yaml | 83 +++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index eb9723510..aed71dbd3 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -19,6 +19,23 @@ components: DateTime: type: string format: date-time + FullTime: + type: string + description: format (e.g., full-time) is from RFC 3339 + format: full-time + DateMonth: + type: string + format: date-month + DateMonthDay: + type: string + format: date-mday + DayInYear: + type: object + properties: + month: + $ref: '#/components/schemas/DateMonth' + monthDay: + $ref: '#/components/schemas/DateMonthDay' Latitude: type: number format: float @@ -65,12 +82,21 @@ components: type: string pattern: '^[A-Fa-f0-9]{9}$' TimeWindow: - type: object - properties: - startTime: - $ref: '#/components/schemas/DateTime' - endTime: - $ref: '#/components/schemas/DateTime' + oneOf: + - type: object + properties: + startTime: + $ref: '#/components/schemas/DateTime' + endTime: + $ref: '#/components/schemas/DateTime' + - type: object + properties: + startTime: + $ref: '#/components/schemas/DateTime' + - type: object + properties: + endTime: + $ref: '#/components/schemas/DateTime' GeoCoordinate: type: object properties: @@ -150,6 +176,14 @@ components: Uri: type: string + TimeInterval: + type: object + properties: + intervalStart: + $ref: '#/components/schemas/FullTime' + intervalEnd: + $ref: '#/components/schemas/FullTime' + AdministrativeState: type: string enum: diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index e04340444..607a000dd 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -397,6 +397,45 @@ components: - UP sst: type: integer + SchedulingTime: + oneOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + - type: object + properties: + timeIntervals: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeInterval' + - type: object + properties: + timeIntervals: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeInterval' + daysOfWeek: + type: array + items: + type: string + enum: + - MONDAY + - TUESDAY + - WEDNESDAY + - THURSDAY + - FRIDAY + - SATURDAY + - SUNDAY + - type: object + properties: + timeIntervals: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeInterval' + daysOfMonth: + type: array + items: + type: integer + minimum: 0 + maximum: 31 #-------- Definition of types used in Trace control NRM fragment------------------ @@ -1784,6 +1823,10 @@ components: $ref: '#/components/schemas/Files-Multiple' MnsRegistry: $ref: '#/components/schemas/MnsRegistry-Single' + Scheduler: + $ref: '#/components/schemas/Scheduler-Multiple' + ConditionMonitor: + $ref: '#/components/schemas/ConditionMonitor-Multiple' ManagedElement-ncO: type: object properties: @@ -1803,6 +1846,10 @@ components: $ref: '#/components/schemas/FileDownloadJob-Multiple' Files: $ref: '#/components/schemas/Files-Multiple' + Scheduler: + $ref: '#/components/schemas/Scheduler-Multiple' + ConditionMonitor: + $ref: '#/components/schemas/ConditionMonitor-Multiple' #-------- Definition of abstract IOCs -------------------------------------------- @@ -1989,6 +2036,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' rootObjectInstances: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + conditionRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' reportingCtrl: $ref: '#/components/schemas/ReportingCtrl' Files: @@ -2210,6 +2259,30 @@ components: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + Scheduler-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + schedulingTime: + $ref: '#/components/schemas/SchedulingTime' + conditionsSatisfied: + type: boolean + ConditionMonitor-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + condition: + type: string + conditionsSatisfied: + type: boolean #-------- Definition of YAML arrays for name-contained IOCs ---------------------- @@ -2269,6 +2342,14 @@ components: type: array items: $ref: '#/components/schemas/MnsInfo-Single' + Scheduler-Multiple: + type: array + items: + $ref: '#/components/schemas/Scheduler-Single' + ConditionMonitor-Multiple: + type: array + items: + $ref: '#/components/schemas/ConditionMonitor-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- @@ -2299,3 +2380,5 @@ components: - $ref: '#/components/schemas/MnsRegistry-Single' - $ref: '#/components/schemas/MnsInfo-Single' + - $ref: '#/components/schemas/Scheduler-Single' + - $ref: '#/components/schemas/ConditionMonitor-Single' -- GitLab From 0efa09fb284b990dba45eaa68bb4d2e8e2f4664e Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 12 Oct 2023 10:04:09 +0000 Subject: [PATCH 2/2] update as per review comments. Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 607a000dd..0c0ad5de6 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -2018,6 +2018,8 @@ components: properties: attributes: type: object + not: + required: [ conditionMonitorRef, schedulerRef ] properties: administrativeState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' @@ -2036,12 +2038,15 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' rootObjectInstances: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - conditionRef: + conditionMonitorRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + schedulerRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' reportingCtrl: $ref: '#/components/schemas/ReportingCtrl' Files: $ref: '#/components/schemas/Files-Multiple' + ThresholdMonitor-Single: allOf: - $ref: '#/components/schemas/Top' @@ -2267,9 +2272,12 @@ components: attributes: type: object properties: - schedulingTime: - $ref: '#/components/schemas/SchedulingTime' - conditionsSatisfied: + schedulingTimes: + type: array + items: + $ref: '#/components/schemas/SchedulingTime' + minItems: 1 + schedulerStatus: type: boolean ConditionMonitor-Single: allOf: @@ -2281,7 +2289,7 @@ components: properties: condition: type: string - conditionsSatisfied: + conditionStatus: type: boolean #-------- Definition of YAML arrays for name-contained IOCs ---------------------- -- GitLab