From 4af3ea303a48e3d347ad1f998b148dd813a40119 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 18 Jan 2024 09:23:55 +0000 Subject: [PATCH 01/12] Upload New File --- TS28318__DSORecovery.yaml | 136 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 TS28318__DSORecovery.yaml diff --git a/TS28318__DSORecovery.yaml b/TS28318__DSORecovery.yaml new file mode 100644 index 000000000..dae8732c3 --- /dev/null +++ b/TS28318__DSORecovery.yaml @@ -0,0 +1,136 @@ +openapi: 3.0.1 +info: + title: 3GPP NRM + version: 18.5.0 + description: >- + OAS 3.0.1 specification of the DSORecovery NRM + © 2023, 3GPP Organizational DSORecovery Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.318; DSORecovery NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.318/ +paths: {} +components: + schemas: + +#-------- Definition of types----------------------------------------------------- + DsoInterventionInfo: + type: object + properties: + dsoFeederRestoreTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + dsoRequiredInterventionDuration: + type: integer + isDsoPriorityRecoveryLocation: + type: boolean + ServiceRestoreInfo: + type: object + properties: + dsoRestoreTimeActual: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + isDsoRestoreComplete: + type: boolean + ServiceLocationIdentifier: + type: object + properties: + geoCoordinate: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate' + energySupplyId: + type: string + UpsInfo: + type: object + properties: + isUpsAvailable: + type: boolean + totalUpsBackupDuration: + type: integer + remainingUpsBackupDuration: + type: integer + baseStationId: + type: string + + + + +#-------- Definition of concrete IOCs -------------------------------------------- + MnS: + oneOf: + - type: object + properties: + SubNetwork: + $ref: '#/components/schemas/SubNetwork-Multiple' + + SubNetwork-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr' + - type: object + properties: + Subnetwork: + $ref: '#/components/schemas/SubNetwork-Multiple' + DsoRapidRecovery: + $ref: '#/components/schemas/DsoRapidRecovery-Multiple' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' + + DsoRapidRecovery-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + dsoOutStartTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + dsoRestoreTimeExpected: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + dsoRapidInterventionInfo: + $ref: '#/components/schemas/DsoInterventionInfo' + dsoServiceRestoreInfo: + $ref: '#/components/schemas/ServiceRestoreInfo' + dsoRapidRecoveryLocation: + $ref: '#/components/schemas/ServiceLocationIdentifier' + upsInfo: + $ref: '#/components/schemas/UpsInfo' + - type: object + properties: + MnoRapidInterventionInfo: + $ref: '#/components/schemas/MnoRapidInterventionInfo-Multiple' + MnoRapidInterventionInfo-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + mnoInterventionTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + mnoInterventionDuration: + type: integer + isMnoInterventionPossible: + type: boolean + + + +#-------- Definition of JSON arrays for name-contained IOCs ---------------------- + + SubNetwork-Multiple: + type: array + items: + $ref: '#/components/schemas/SubNetwork-Single' + DsoRapidRecovery-Multiple: + type: array + items: + $ref: '#/components/schemas/DsoRapidRecovery-Single' + MnoRapidInterventionInfo-Multiple: + type: array + items: + $ref: '#/components/schemas/MnoRapidInterventionInfo-Single' + +#--------------------------------- Definition ------------------------------------ + + resources-DSORecovery: + oneOf: + - $ref: '#/components/schemas/MnS' + - $ref: '#/components/schemas/SubNetwork-Single' + - $ref: '#/components/schemas/DsoRapidRecovery-Single' + - $ref: '#/components/schemas/MnoRapidInterventionInfo-Single' -- GitLab From 76236664e1e19252ed613904a7aa6d37e82bb82b Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 1 Feb 2024 18:59:05 +0000 Subject: [PATCH 02/12] Update TS28318__DSORecovery.yaml --- TS28318__DSORecovery.yaml | 84 ++++++++++----------------------------- 1 file changed, 20 insertions(+), 64 deletions(-) diff --git a/TS28318__DSORecovery.yaml b/TS28318__DSORecovery.yaml index dae8732c3..be30d1952 100644 --- a/TS28318__DSORecovery.yaml +++ b/TS28318__DSORecovery.yaml @@ -14,44 +14,16 @@ components: schemas: #-------- Definition of types----------------------------------------------------- - DsoInterventionInfo: + EnergyServiceLocation: type: object properties: - dsoFeederRestoreTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - dsoRequiredInterventionDuration: - type: integer - isDsoPriorityRecoveryLocation: - type: boolean - ServiceRestoreInfo: - type: object - properties: - dsoRestoreTimeActual: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - isDsoRestoreComplete: - type: boolean - ServiceLocationIdentifier: - type: object - properties: - geoCoordinate: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate' - energySupplyId: + CGI: type: string - UpsInfo: - type: object - properties: - isUpsAvailable: - type: boolean - totalUpsBackupDuration: - type: integer - remainingUpsBackupDuration: - type: integer - baseStationId: + energySupplyId: type: string - #-------- Definition of concrete IOCs -------------------------------------------- MnS: oneOf: @@ -72,42 +44,31 @@ components: properties: Subnetwork: $ref: '#/components/schemas/SubNetwork-Multiple' - DsoRapidRecovery: - $ref: '#/components/schemas/DsoRapidRecovery-Multiple' + OutageAndRecoveryInfo: + $ref: '#/components/schemas/OutageAndRecoveryInfo-Multiple' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' - DsoRapidRecovery-Single: + OutageAndRecoveryInfo-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: - dsoOutStartTime: + outageStartTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - dsoRestoreTimeExpected: + expectedOutageEndTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - dsoRapidInterventionInfo: - $ref: '#/components/schemas/DsoInterventionInfo' - dsoServiceRestoreInfo: - $ref: '#/components/schemas/ServiceRestoreInfo' - dsoRapidRecoveryLocation: - $ref: '#/components/schemas/ServiceLocationIdentifier' - upsInfo: - $ref: '#/components/schemas/UpsInfo' - - type: object - properties: - MnoRapidInterventionInfo: - $ref: '#/components/schemas/MnoRapidInterventionInfo-Multiple' - MnoRapidInterventionInfo-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: + dsoRapidInterventionTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + dsoRapidInterventionDuration: + type: integer mnoInterventionTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - mnoInterventionDuration: + dsoRapidInterventionDuration: + type: integer + mnoMaxServiceDuration: type: integer - isMnoInterventionPossible: - type: boolean + affectedArea: + $ref: '#/components/schemas/EnergyServiceLocation' @@ -117,14 +78,10 @@ components: type: array items: $ref: '#/components/schemas/SubNetwork-Single' - DsoRapidRecovery-Multiple: - type: array - items: - $ref: '#/components/schemas/DsoRapidRecovery-Single' - MnoRapidInterventionInfo-Multiple: + OutageAndRecoveryInfo-Multiple: type: array items: - $ref: '#/components/schemas/MnoRapidInterventionInfo-Single' + $ref: '#/components/schemas/OutageAndRecoveryInfo-Single' #--------------------------------- Definition ------------------------------------ @@ -132,5 +89,4 @@ components: oneOf: - $ref: '#/components/schemas/MnS' - $ref: '#/components/schemas/SubNetwork-Single' - - $ref: '#/components/schemas/DsoRapidRecovery-Single' - - $ref: '#/components/schemas/MnoRapidInterventionInfo-Single' + - $ref: '#/components/schemas/OutageAndRecoveryInfo-Single' -- GitLab From 23972deb1cfba10646f303a92cfa5658369b93f5 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 1 Feb 2024 19:09:07 +0000 Subject: [PATCH 03/12] Delete TS28318__DSORecovery.yaml --- TS28318__DSORecovery.yaml | 92 --------------------------------------- 1 file changed, 92 deletions(-) delete mode 100644 TS28318__DSORecovery.yaml diff --git a/TS28318__DSORecovery.yaml b/TS28318__DSORecovery.yaml deleted file mode 100644 index be30d1952..000000000 --- a/TS28318__DSORecovery.yaml +++ /dev/null @@ -1,92 +0,0 @@ -openapi: 3.0.1 -info: - title: 3GPP NRM - version: 18.5.0 - description: >- - OAS 3.0.1 specification of the DSORecovery NRM - © 2023, 3GPP Organizational DSORecovery Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). - All rights reserved. -externalDocs: - description: 3GPP TS 28.318; DSORecovery NRM - url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.318/ -paths: {} -components: - schemas: - -#-------- Definition of types----------------------------------------------------- - EnergyServiceLocation: - type: object - properties: - CGI: - type: string - energySupplyId: - type: string - - - -#-------- Definition of concrete IOCs -------------------------------------------- - MnS: - oneOf: - - type: object - properties: - SubNetwork: - $ref: '#/components/schemas/SubNetwork-Multiple' - - SubNetwork-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr' - - type: object - properties: - Subnetwork: - $ref: '#/components/schemas/SubNetwork-Multiple' - OutageAndRecoveryInfo: - $ref: '#/components/schemas/OutageAndRecoveryInfo-Multiple' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' - - OutageAndRecoveryInfo-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - outageStartTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - expectedOutageEndTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - dsoRapidInterventionTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - dsoRapidInterventionDuration: - type: integer - mnoInterventionTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - dsoRapidInterventionDuration: - type: integer - mnoMaxServiceDuration: - type: integer - affectedArea: - $ref: '#/components/schemas/EnergyServiceLocation' - - - -#-------- Definition of JSON arrays for name-contained IOCs ---------------------- - - SubNetwork-Multiple: - type: array - items: - $ref: '#/components/schemas/SubNetwork-Single' - OutageAndRecoveryInfo-Multiple: - type: array - items: - $ref: '#/components/schemas/OutageAndRecoveryInfo-Single' - -#--------------------------------- Definition ------------------------------------ - - resources-DSORecovery: - oneOf: - - $ref: '#/components/schemas/MnS' - - $ref: '#/components/schemas/SubNetwork-Single' - - $ref: '#/components/schemas/OutageAndRecoveryInfo-Single' -- GitLab From 8344251f70f6f79aff8670fcb0f7e937ac9fcde9 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 1 Feb 2024 19:09:45 +0000 Subject: [PATCH 04/12] Upload New File --- OpenAPI/TS28318__DSORecovery.yaml | 92 +++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 OpenAPI/TS28318__DSORecovery.yaml diff --git a/OpenAPI/TS28318__DSORecovery.yaml b/OpenAPI/TS28318__DSORecovery.yaml new file mode 100644 index 000000000..be30d1952 --- /dev/null +++ b/OpenAPI/TS28318__DSORecovery.yaml @@ -0,0 +1,92 @@ +openapi: 3.0.1 +info: + title: 3GPP NRM + version: 18.5.0 + description: >- + OAS 3.0.1 specification of the DSORecovery NRM + © 2023, 3GPP Organizational DSORecovery Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.318; DSORecovery NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.318/ +paths: {} +components: + schemas: + +#-------- Definition of types----------------------------------------------------- + EnergyServiceLocation: + type: object + properties: + CGI: + type: string + energySupplyId: + type: string + + + +#-------- Definition of concrete IOCs -------------------------------------------- + MnS: + oneOf: + - type: object + properties: + SubNetwork: + $ref: '#/components/schemas/SubNetwork-Multiple' + + SubNetwork-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr' + - type: object + properties: + Subnetwork: + $ref: '#/components/schemas/SubNetwork-Multiple' + OutageAndRecoveryInfo: + $ref: '#/components/schemas/OutageAndRecoveryInfo-Multiple' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' + + OutageAndRecoveryInfo-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + outageStartTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + expectedOutageEndTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + dsoRapidInterventionTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + dsoRapidInterventionDuration: + type: integer + mnoInterventionTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + dsoRapidInterventionDuration: + type: integer + mnoMaxServiceDuration: + type: integer + affectedArea: + $ref: '#/components/schemas/EnergyServiceLocation' + + + +#-------- Definition of JSON arrays for name-contained IOCs ---------------------- + + SubNetwork-Multiple: + type: array + items: + $ref: '#/components/schemas/SubNetwork-Single' + OutageAndRecoveryInfo-Multiple: + type: array + items: + $ref: '#/components/schemas/OutageAndRecoveryInfo-Single' + +#--------------------------------- Definition ------------------------------------ + + resources-DSORecovery: + oneOf: + - $ref: '#/components/schemas/MnS' + - $ref: '#/components/schemas/SubNetwork-Single' + - $ref: '#/components/schemas/OutageAndRecoveryInfo-Single' -- GitLab From 61a4a506e60a5e4f538d7b00cb892a0891810e08 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 1 Feb 2024 19:19:32 +0000 Subject: [PATCH 05/12] Update TS28318__DSORecovery.yaml --- OpenAPI/TS28318__DSORecovery.yaml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28318__DSORecovery.yaml b/OpenAPI/TS28318__DSORecovery.yaml index be30d1952..17175544f 100644 --- a/OpenAPI/TS28318__DSORecovery.yaml +++ b/OpenAPI/TS28318__DSORecovery.yaml @@ -46,6 +46,8 @@ components: $ref: '#/components/schemas/SubNetwork-Multiple' OutageAndRecoveryInfo: $ref: '#/components/schemas/OutageAndRecoveryInfo-Multiple' + DsoThresholdMonitor: + $ref: '#/components/schemas/DsoThresholdMonitor-Multiple' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' OutageAndRecoveryInfo-Single: @@ -68,7 +70,14 @@ components: mnoMaxServiceDuration: type: integer affectedArea: - $ref: '#/components/schemas/EnergyServiceLocation' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AreaOfInterest' + DsoThresholdMonitor-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdMonitor' + - type: object + properties: + targetThresholdLocation: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' @@ -82,6 +91,10 @@ components: type: array items: $ref: '#/components/schemas/OutageAndRecoveryInfo-Single' + DsoThresholdMonitor-Multiple: + type: array + items: + $ref: '#/components/schemas/DsoThresholdMonitor-Single' #--------------------------------- Definition ------------------------------------ @@ -90,3 +103,4 @@ components: - $ref: '#/components/schemas/MnS' - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/OutageAndRecoveryInfo-Single' + - $ref: '#/components/schemas/DsoThresholdMonitor-Single' -- GitLab From acccf6cafbca4c9ec8e6b7649b51b9c7d9f73dd8 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 1 Feb 2024 19:23:36 +0000 Subject: [PATCH 06/12] Update TS28318__DSORecovery.yaml --- ...DSORecovery.yaml => TS28318__OutageAndRecoveryInfo.yaml} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename OpenAPI/{TS28318__DSORecovery.yaml => TS28318__OutageAndRecoveryInfo.yaml} (93%) diff --git a/OpenAPI/TS28318__DSORecovery.yaml b/OpenAPI/TS28318__OutageAndRecoveryInfo.yaml similarity index 93% rename from OpenAPI/TS28318__DSORecovery.yaml rename to OpenAPI/TS28318__OutageAndRecoveryInfo.yaml index 17175544f..d392d6f2a 100644 --- a/OpenAPI/TS28318__DSORecovery.yaml +++ b/OpenAPI/TS28318__OutageAndRecoveryInfo.yaml @@ -3,11 +3,11 @@ info: title: 3GPP NRM version: 18.5.0 description: >- - OAS 3.0.1 specification of the DSORecovery NRM - © 2023, 3GPP Organizational DSORecovery Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + OAS 3.0.1 specification of the OutageAndRecoveryInfo NRM + © 2023, 3GPP Organizational OutageAndRecoveryInfo Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.318; DSORecovery NRM + description: 3GPP TS 28.318; OutageAndRecoveryInfo NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.318/ paths: {} components: -- GitLab From 47d14c4601e8907c46f7311dd3ab29266e978c2a Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 1 Feb 2024 19:27:06 +0000 Subject: [PATCH 07/12] Update TS28318__OutageAndRecoveryInfo.yaml --- ...ageAndRecoveryInfo.yaml => TS28318_OutageAndRecoveryInfo.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename OpenAPI/{TS28318__OutageAndRecoveryInfo.yaml => TS28318_OutageAndRecoveryInfo.yaml} (100%) diff --git a/OpenAPI/TS28318__OutageAndRecoveryInfo.yaml b/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml similarity index 100% rename from OpenAPI/TS28318__OutageAndRecoveryInfo.yaml rename to OpenAPI/TS28318_OutageAndRecoveryInfo.yaml -- GitLab From 4e59de88e3b4eb55e0bd3155de486057758e3137 Mon Sep 17 00:00:00 2001 From: gautamd Date: Fri, 2 Feb 2024 07:30:10 +0000 Subject: [PATCH 08/12] Update TS28318_OutageAndRecoveryInfo.yaml --- OpenAPI/TS28318_OutageAndRecoveryInfo.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml b/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml index d392d6f2a..c653a66db 100644 --- a/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml +++ b/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml @@ -65,12 +65,16 @@ components: type: integer mnoInterventionTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - dsoRapidInterventionDuration: + mnoInterventionDuration: type: integer mnoMaxServiceDuration: type: integer affectedArea: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AreaOfInterest' + isAffectedAreaPriority: + type: boolean + actualOutageEndTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' DsoThresholdMonitor-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdMonitor' -- GitLab From 33c1f3015c03affedafe875a0a278bd96483f169 Mon Sep 17 00:00:00 2001 From: gautamd Date: Fri, 2 Feb 2024 07:38:40 +0000 Subject: [PATCH 09/12] Update TS28318_OutageAndRecoveryInfo.yaml --- OpenAPI/TS28318_OutageAndRecoveryInfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml b/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml index c653a66db..bdaafca13 100644 --- a/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml +++ b/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml @@ -77,7 +77,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' DsoThresholdMonitor-Single: allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdMonitor' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdMonitor-Single' - type: object properties: targetThresholdLocation: -- GitLab From 848164edb838cc3d305dda27f28b6238b3c5aec8 Mon Sep 17 00:00:00 2001 From: gautamd Date: Wed, 7 Feb 2024 13:06:16 +0000 Subject: [PATCH 10/12] Update TS28318_OutageAndRecoveryInfo.yaml --- OpenAPI/TS28318_OutageAndRecoveryInfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml b/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml index bdaafca13..252977ac9 100644 --- a/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml +++ b/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml @@ -81,7 +81,7 @@ components: - type: object properties: targetThresholdLocation: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AreaOfInterest' -- GitLab From f674863d3423713879ad4439b89cb2887bd36140 Mon Sep 17 00:00:00 2001 From: gautamd Date: Wed, 7 Feb 2024 13:10:32 +0000 Subject: [PATCH 11/12] Update TS28318_OutageAndRecoveryInfo.yaml --- OpenAPI/TS28318_OutageAndRecoveryInfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml b/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml index 252977ac9..3c5e2640d 100644 --- a/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml +++ b/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml @@ -70,7 +70,7 @@ components: mnoMaxServiceDuration: type: integer affectedArea: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AreaOfInterest' + $ref: '#/components/schemas/EnergyServiceLocation' isAffectedAreaPriority: type: boolean actualOutageEndTime: -- GitLab From d2b51732db0886a505faabbc231ef920eba0db82 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 7 Feb 2024 15:10:28 +0000 Subject: [PATCH 12/12] Change file name for NSO yaml file --- .../{TS28318_OutageAndRecoveryInfo.yaml => TS28.318_DsoNrm.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename OpenAPI/{TS28318_OutageAndRecoveryInfo.yaml => TS28.318_DsoNrm.yaml} (100%) diff --git a/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml b/OpenAPI/TS28.318_DsoNrm.yaml similarity index 100% rename from OpenAPI/TS28318_OutageAndRecoveryInfo.yaml rename to OpenAPI/TS28.318_DsoNrm.yaml -- GitLab