From 55d02792037289c8f216555e7ae6d58d622136b1 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Wed, 26 Mar 2025 07:06:09 +0000 Subject: [PATCH 01/17] Add NRM for EE --- OpenAPI/TS28310_EnergyEfficiency.yaml | 90 +++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 OpenAPI/TS28310_EnergyEfficiency.yaml diff --git a/OpenAPI/TS28310_EnergyEfficiency.yaml b/OpenAPI/TS28310_EnergyEfficiency.yaml new file mode 100644 index 000000000..ec1e2e5a4 --- /dev/null +++ b/OpenAPI/TS28310_EnergyEfficiency.yaml @@ -0,0 +1,90 @@ +openapi: 3.0.1 +info: + title: EE NRM + version: 19.0.0 + description: >- + OAS 3.0.1 specification of the Energy Efficiency NRM + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.310; Energy Efficiency NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.310/ +paths: {} +components: + schemas: + +#-------- Definition of types----------------------------------------------------- + EnergySourceInfo: + type: object + properties: + energySourceType: + type: string + energySourceCef: + type: integer + renewableEnergy: + type: boolean + energyCompositionRatio: + type: integer + default: 100 + minimum: 0 + maximum: 100 + EnergySupplyMode: + type: string + enum: + - GRID_ELECTRICITY + - BACKUP_ENERGY + - LOCALLY_GENERATED_ENERGY + +#-------- Definition of concrete IOCs -------------------------------------------- + SubNetwork-ncO-EENrm: + type: object + properties: + EnergySupplyInfo: + $ref: '#/components/schemas/EnergySupplyInfo-Multiple' + EnergyInfoGroup: + $ref: '#/components/schemas/EnergyInfoGroup-Multiple' + + EnergySupplyInfo-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + energySupplyMode: + $ref: '#/components/schemas/EnergySupplyMode' + energySourceList: + $ref: '#/components/schemas/EnergySourceInfo' + plannedOutgates: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + availableBackupEnergy: + type: integer + EnergyInfoGroup-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/GenericCollection-Single' + - type: object + properties: + attributes: + type: object + properties: + energySupplyRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + +#-------- Definition of JSON arrays for name-contained IOCs ---------------------- + + EnergySupplyInfo-Multiple: + type: array + items: + $ref: '#/components/schemas/EnergySupplyInfo-Single' + EnergyInfoGroup-Multiple: + type: array + items: + $ref: '#/components/schemas/EnergyInfoGroup-Single' + +#--------------------------------- Definition ------------------------------------ + + resources-EnergyEfficiency: + oneOf: + - $ref: '#/components/schemas/EnergySupplyInfo-Single' + - $ref: '#/components/schemas/EnergyInfoGroup-Single' -- GitLab From 93c6c44956bce70f1c10c3ed4f6def42e6f1a57b Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Wed, 26 Mar 2025 07:08:22 +0000 Subject: [PATCH 02/17] Add resources-EnergyEfficiency to resources-feature --- OpenAPI/TS28623_FeatureNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28623_FeatureNrm.yaml b/OpenAPI/TS28623_FeatureNrm.yaml index 3171f4557..00a90ebd9 100644 --- a/OpenAPI/TS28623_FeatureNrm.yaml +++ b/OpenAPI/TS28623_FeatureNrm.yaml @@ -36,5 +36,6 @@ components: - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm' + - $ref: 'TS28310_EnergyEfficiency.yaml#/components/schemas/resources-EnergyEfficiency' #----- Definitions in TS 28.623 for TS 28.532 --------------------------# -- GitLab From 4b79136239bb6ff9d312f5c9bfe15f1d5d4e1173 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Wed, 26 Mar 2025 07:10:20 +0000 Subject: [PATCH 03/17] Add GenericCollection IOC and SubNetwork-ncO-EENrm --- OpenAPI/TS28623_GenericNrm.yaml | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 89d1d35e8..78db85e1f 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -386,6 +386,8 @@ components: $ref: '#/components/schemas/ConditionMonitor-Multiple' SupportedNotifications: $ref: '#/components/schemas/SupportedNotifications-Single' + GenericCollection: + $ref: '#/components/schemas/GenericCollection-Multiple' ManagedElement-ncO: @@ -604,7 +606,8 @@ components: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm' - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm' - + - $ref: 'TS28310_EnergyEfficiency.yaml#/components/schemas/SubNetwork-ncO-EENrm' + ManagedElement-Single: allOf: @@ -634,6 +637,19 @@ components: ManagedElement: $ref: '#/components/schemas/ManagedElement-Multiple' + GenericCollection-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + userLabel: + type: string + memberDNs: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + #-------- Definition of YAML arrays for name-contained IOCs ---------------------- VsDataContainer-Multiple: @@ -668,6 +684,10 @@ components: type: array items: $ref: '#/components/schemas/ManagedElement-Single' + GenericCollection-Multiple: + type: array + items: + $ref: '#/components/schemas/GenericCollection-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- @@ -684,3 +704,5 @@ components: - $ref: '#/components/schemas/SupportedNotifications-Single' - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/ManagedElement-Single' + - $ref: '#/components/schemas/GenericCollection-Single' + - $ref: '#/components/schemas/GenericCollection-Single' \ No newline at end of file -- GitLab From 10b1f4d2195cf0e4696f9384b331b75b17d8d9c8 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Wed, 26 Mar 2025 07:32:44 +0000 Subject: [PATCH 04/17] Add groupReferenceList attribute --- OpenAPI/TS28623_GenericNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 78db85e1f..5f7cfa6cd 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -277,6 +277,8 @@ components: type: string objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + groupReferenceList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' VsDataContainer: $ref: '#/components/schemas/VsDataContainer-Multiple' required: @@ -291,6 +293,8 @@ components: type: string objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + groupReferenceList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' VsDataContainer: $ref: '#/components/schemas/VsDataContainer-Multiple' required: -- GitLab From 4c8259f9651701cd1e7bbd49fab4eed56ba5234c Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Wed, 26 Mar 2025 07:44:09 +0000 Subject: [PATCH 05/17] Add Energy Efficiency NRM (TS 28.310) --- OpenAPI/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/README.md b/OpenAPI/README.md index c0e969a34..dfa256e1a 100644 --- a/OpenAPI/README.md +++ b/OpenAPI/README.md @@ -103,6 +103,10 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28318_DsoNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28318_DsoNrm.yaml)) +* Energy Efficiency NRM (TS 28.310) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28310_EnergyEfficiency.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28310_EnergyEfficiency.yaml)) + ## Management Services (MnS) -- GitLab From ee3960330976aabf385080ebbca8c89d568431c5 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Wed, 26 Mar 2025 11:53:47 +0000 Subject: [PATCH 06/17] Corrections to the EE NRM --- OpenAPI/TS28310_EnergyEfficiency.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28310_EnergyEfficiency.yaml b/OpenAPI/TS28310_EnergyEfficiency.yaml index ec1e2e5a4..997c6256b 100644 --- a/OpenAPI/TS28310_EnergyEfficiency.yaml +++ b/OpenAPI/TS28310_EnergyEfficiency.yaml @@ -55,9 +55,16 @@ components: energySupplyMode: $ref: '#/components/schemas/EnergySupplyMode' energySourceList: - $ref: '#/components/schemas/EnergySourceInfo' + type: array + uniqueItems: true + minItems: 1 + items: + $ref: '#/components/schemas/EnergySourceInfo' plannedOutgates: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + type: array + uniqueItems: true + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' availableBackupEnergy: type: integer EnergyInfoGroup-Single: -- GitLab From e91935b7f3bcfef273e832d29195b78c5f60e3f4 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Wed, 26 Mar 2025 15:12:48 +0000 Subject: [PATCH 07/17] Update 5 files - /OpenAPI/TS28310_EnergyEfficiency.yaml - /OpenAPI/TS28310_EnergyEfficiencyNrm.yaml - /OpenAPI/TS28623_FeatureNrm.yaml - /OpenAPI/TS28623_GenericNrm.yaml - /OpenAPI/README.md --- OpenAPI/README.md | 4 ++-- ...EnergyEfficiency.yaml => TS28310_EnergyEfficiencyNrm.yaml} | 2 +- OpenAPI/TS28623_FeatureNrm.yaml | 2 +- OpenAPI/TS28623_GenericNrm.yaml | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) rename OpenAPI/{TS28310_EnergyEfficiency.yaml => TS28310_EnergyEfficiencyNrm.yaml} (95%) diff --git a/OpenAPI/README.md b/OpenAPI/README.md index dfa256e1a..46edcfd6b 100644 --- a/OpenAPI/README.md +++ b/OpenAPI/README.md @@ -104,8 +104,8 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28318_DsoNrm.yaml)) * Energy Efficiency NRM (TS 28.310) -([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28310_EnergyEfficiency.yaml)) -([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28310_EnergyEfficiency.yaml)) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28310_EnergyEfficiencyNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28310_EnergyEfficiencyNrm.yaml)) ## Management Services (MnS) diff --git a/OpenAPI/TS28310_EnergyEfficiency.yaml b/OpenAPI/TS28310_EnergyEfficiencyNrm.yaml similarity index 95% rename from OpenAPI/TS28310_EnergyEfficiency.yaml rename to OpenAPI/TS28310_EnergyEfficiencyNrm.yaml index 997c6256b..8000f2391 100644 --- a/OpenAPI/TS28310_EnergyEfficiency.yaml +++ b/OpenAPI/TS28310_EnergyEfficiencyNrm.yaml @@ -91,7 +91,7 @@ components: #--------------------------------- Definition ------------------------------------ - resources-EnergyEfficiency: + resources-EnergyEfficiencyNrm: oneOf: - $ref: '#/components/schemas/EnergySupplyInfo-Single' - $ref: '#/components/schemas/EnergyInfoGroup-Single' diff --git a/OpenAPI/TS28623_FeatureNrm.yaml b/OpenAPI/TS28623_FeatureNrm.yaml index 00a90ebd9..74c5f3c05 100644 --- a/OpenAPI/TS28623_FeatureNrm.yaml +++ b/OpenAPI/TS28623_FeatureNrm.yaml @@ -36,6 +36,6 @@ components: - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm' - - $ref: 'TS28310_EnergyEfficiency.yaml#/components/schemas/resources-EnergyEfficiency' + - $ref: 'TS28310_EnergyEfficiency.yaml#/components/schemas/resources-EnergyEfficiencyNrm' #----- Definitions in TS 28.623 for TS 28.532 --------------------------# diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 5f7cfa6cd..c87249fb8 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -708,5 +708,4 @@ components: - $ref: '#/components/schemas/SupportedNotifications-Single' - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/ManagedElement-Single' - - $ref: '#/components/schemas/GenericCollection-Single' - $ref: '#/components/schemas/GenericCollection-Single' \ No newline at end of file -- GitLab From f87f0386fb7fc3f4f9e0ba677f5e0c41baf37d8d Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Wed, 26 Mar 2025 15:17:23 +0000 Subject: [PATCH 08/17] File name in resources-feature fixed --- OpenAPI/TS28623_FeatureNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_FeatureNrm.yaml b/OpenAPI/TS28623_FeatureNrm.yaml index 74c5f3c05..e15ebc03c 100644 --- a/OpenAPI/TS28623_FeatureNrm.yaml +++ b/OpenAPI/TS28623_FeatureNrm.yaml @@ -36,6 +36,6 @@ components: - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm' - - $ref: 'TS28310_EnergyEfficiency.yaml#/components/schemas/resources-EnergyEfficiencyNrm' + - $ref: 'TS28310_EnergyEfficiencyNrm.yaml#/components/schemas/resources-EnergyEfficiencyNrm' #----- Definitions in TS 28.623 for TS 28.532 --------------------------# -- GitLab From 3ce83a07ded528a2fda230e5de06206d329db49e Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Wed, 26 Mar 2025 15:20:14 +0000 Subject: [PATCH 09/17] Fixed error in SubNetwork-Single --- OpenAPI/TS28623_GenericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index c87249fb8..78b755f54 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -610,7 +610,7 @@ components: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm' - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm' - - $ref: 'TS28310_EnergyEfficiency.yaml#/components/schemas/SubNetwork-ncO-EENrm' + - $ref: 'TS28310_EnergyEfficiencyNrm.yaml#/components/schemas/SubNetwork-ncO-EENrm' ManagedElement-Single: -- GitLab From 0e31081a63a033cc948ac97857712cd4819064f8 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Thu, 27 Mar 2025 05:53:57 +0000 Subject: [PATCH 10/17] Update 2 files - /OpenAPI/TS28310_EnergyEfficiencyNrm.yaml - /OpenAPI/TS28623_FeatureNrm.yaml --- OpenAPI/TS28310_EnergyEfficiencyNrm.yaml | 2 +- OpenAPI/TS28623_FeatureNrm.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28310_EnergyEfficiencyNrm.yaml b/OpenAPI/TS28310_EnergyEfficiencyNrm.yaml index 8000f2391..482b81557 100644 --- a/OpenAPI/TS28310_EnergyEfficiencyNrm.yaml +++ b/OpenAPI/TS28310_EnergyEfficiencyNrm.yaml @@ -91,7 +91,7 @@ components: #--------------------------------- Definition ------------------------------------ - resources-EnergyEfficiencyNrm: + resources-energyEfficiencyNrm: oneOf: - $ref: '#/components/schemas/EnergySupplyInfo-Single' - $ref: '#/components/schemas/EnergyInfoGroup-Single' diff --git a/OpenAPI/TS28623_FeatureNrm.yaml b/OpenAPI/TS28623_FeatureNrm.yaml index e15ebc03c..744735868 100644 --- a/OpenAPI/TS28623_FeatureNrm.yaml +++ b/OpenAPI/TS28623_FeatureNrm.yaml @@ -36,6 +36,6 @@ components: - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm' - - $ref: 'TS28310_EnergyEfficiencyNrm.yaml#/components/schemas/resources-EnergyEfficiencyNrm' + - $ref: 'TS28310_EnergyEfficiencyNrm.yaml#/components/schemas/resources-energyEfficiencyNrm' #----- Definitions in TS 28.623 for TS 28.532 --------------------------# -- GitLab From b30d6069500f02aca6af26d8655b3be86b3ea6bd Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Thu, 10 Apr 2025 09:36:56 +0000 Subject: [PATCH 11/17] Changes to address review comments during the meeting. --- OpenAPI/README.md | 4 +-- ...iciencyNrm.yaml => TS28310_EnergyNrm.yaml} | 17 ++++------- OpenAPI/TS28623_FeatureNrm.yaml | 2 +- OpenAPI/TS28623_GenericNrm.yaml | 28 ++----------------- 4 files changed, 10 insertions(+), 41 deletions(-) rename OpenAPI/{TS28310_EnergyEfficiencyNrm.yaml => TS28310_EnergyNrm.yaml} (81%) diff --git a/OpenAPI/README.md b/OpenAPI/README.md index 46edcfd6b..792210f32 100644 --- a/OpenAPI/README.md +++ b/OpenAPI/README.md @@ -103,9 +103,9 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28318_DsoNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28318_DsoNrm.yaml)) -* Energy Efficiency NRM (TS 28.310) +* Energy NRM (TS 28.310) ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28310_EnergyEfficiencyNrm.yaml)) -([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28310_EnergyEfficiencyNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28310_EnergyNrm.yaml)) ## Management Services (MnS) diff --git a/OpenAPI/TS28310_EnergyEfficiencyNrm.yaml b/OpenAPI/TS28310_EnergyNrm.yaml similarity index 81% rename from OpenAPI/TS28310_EnergyEfficiencyNrm.yaml rename to OpenAPI/TS28310_EnergyNrm.yaml index 482b81557..90d969320 100644 --- a/OpenAPI/TS28310_EnergyEfficiencyNrm.yaml +++ b/OpenAPI/TS28310_EnergyNrm.yaml @@ -3,11 +3,11 @@ info: title: EE NRM version: 19.0.0 description: >- - OAS 3.0.1 specification of the Energy Efficiency NRM + OAS 3.0.1 specification of the Energy NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.310; Energy Efficiency NRM + description: 3GPP TS 28.310; Energy NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.310/ paths: {} components: @@ -36,7 +36,7 @@ components: - LOCALLY_GENERATED_ENERGY #-------- Definition of concrete IOCs -------------------------------------------- - SubNetwork-ncO-EENrm: + SubNetwork-ncO-EnergyNrm: type: object properties: EnergySupplyInfo: @@ -60,13 +60,6 @@ components: minItems: 1 items: $ref: '#/components/schemas/EnergySourceInfo' - plannedOutgates: - type: array - uniqueItems: true - items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' - availableBackupEnergy: - type: integer EnergyInfoGroup-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/GenericCollection-Single' @@ -75,7 +68,7 @@ components: attributes: type: object properties: - energySupplyRefList: + energySupplyModeRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -91,7 +84,7 @@ components: #--------------------------------- Definition ------------------------------------ - resources-energyEfficiencyNrm: + resources-energyNrm: oneOf: - $ref: '#/components/schemas/EnergySupplyInfo-Single' - $ref: '#/components/schemas/EnergyInfoGroup-Single' diff --git a/OpenAPI/TS28623_FeatureNrm.yaml b/OpenAPI/TS28623_FeatureNrm.yaml index 744735868..09255b3ba 100644 --- a/OpenAPI/TS28623_FeatureNrm.yaml +++ b/OpenAPI/TS28623_FeatureNrm.yaml @@ -36,6 +36,6 @@ components: - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm' - - $ref: 'TS28310_EnergyEfficiencyNrm.yaml#/components/schemas/resources-energyEfficiencyNrm' + - $ref: 'TS28310_EnergyNrm.yaml#/components/schemas/resources-energyNrm' #----- Definitions in TS 28.623 for TS 28.532 --------------------------# diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 78b755f54..b48c3e5c3 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -277,8 +277,6 @@ components: type: string objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - groupReferenceList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' VsDataContainer: $ref: '#/components/schemas/VsDataContainer-Multiple' required: @@ -293,8 +291,6 @@ components: type: string objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - groupReferenceList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' VsDataContainer: $ref: '#/components/schemas/VsDataContainer-Multiple' required: @@ -390,8 +386,6 @@ components: $ref: '#/components/schemas/ConditionMonitor-Multiple' SupportedNotifications: $ref: '#/components/schemas/SupportedNotifications-Single' - GenericCollection: - $ref: '#/components/schemas/GenericCollection-Multiple' ManagedElement-ncO: @@ -610,7 +604,7 @@ components: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm' - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm' - - $ref: 'TS28310_EnergyEfficiencyNrm.yaml#/components/schemas/SubNetwork-ncO-EENrm' + - $ref: 'TS28310_EnergyEfficiencyNrm.yaml#/components/schemas/SubNetwork-ncO-EnergyNrm' ManagedElement-Single: @@ -641,19 +635,6 @@ components: ManagedElement: $ref: '#/components/schemas/ManagedElement-Multiple' - GenericCollection-Single: - allOf: - - $ref: '#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - properties: - userLabel: - type: string - memberDNs: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - #-------- Definition of YAML arrays for name-contained IOCs ---------------------- VsDataContainer-Multiple: @@ -688,10 +669,6 @@ components: type: array items: $ref: '#/components/schemas/ManagedElement-Single' - GenericCollection-Multiple: - type: array - items: - $ref: '#/components/schemas/GenericCollection-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- @@ -707,5 +684,4 @@ components: - $ref: '#/components/schemas/ConditionMonitor-Single' - $ref: '#/components/schemas/SupportedNotifications-Single' - $ref: '#/components/schemas/SubNetwork-Single' - - $ref: '#/components/schemas/ManagedElement-Single' - - $ref: '#/components/schemas/GenericCollection-Single' \ No newline at end of file + - $ref: '#/components/schemas/ManagedElement-Single' \ No newline at end of file -- GitLab From 9437e52b3f3a11332b6d77b9b65038346cb5d54e Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Thu, 10 Apr 2025 09:39:06 +0000 Subject: [PATCH 12/17] Fixing file name --- OpenAPI/TS28623_GenericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index b48c3e5c3..b24d04c74 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -604,7 +604,7 @@ components: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm' - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm' - - $ref: 'TS28310_EnergyEfficiencyNrm.yaml#/components/schemas/SubNetwork-ncO-EnergyNrm' + - $ref: 'TS28310_EnergyNrm.yaml#/components/schemas/SubNetwork-ncO-EnergyNrm' ManagedElement-Single: -- GitLab From e8740148f8ef14433ab25f33ffd95e72fc513cc3 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Thu, 10 Apr 2025 09:41:19 +0000 Subject: [PATCH 13/17] Fixing inheritance error --- OpenAPI/TS28310_EnergyNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28310_EnergyNrm.yaml b/OpenAPI/TS28310_EnergyNrm.yaml index 90d969320..6477a9b33 100644 --- a/OpenAPI/TS28310_EnergyNrm.yaml +++ b/OpenAPI/TS28310_EnergyNrm.yaml @@ -62,7 +62,7 @@ components: $ref: '#/components/schemas/EnergySourceInfo' EnergyInfoGroup-Single: allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/GenericCollection-Single' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: -- GitLab From 41fc7e81a10f52db00d2127ea58521e53d701356 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Thu, 10 Apr 2025 13:34:51 +0000 Subject: [PATCH 14/17] Update attribute name of energyCompositionPercentage --- OpenAPI/TS28310_EnergyNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28310_EnergyNrm.yaml b/OpenAPI/TS28310_EnergyNrm.yaml index 6477a9b33..71d71efe2 100644 --- a/OpenAPI/TS28310_EnergyNrm.yaml +++ b/OpenAPI/TS28310_EnergyNrm.yaml @@ -23,7 +23,7 @@ components: type: integer renewableEnergy: type: boolean - energyCompositionRatio: + energyCompositionPercentage: type: integer default: 100 minimum: 0 -- GitLab From 9e2e37d4af5902d464300cad30d0e909fb70774c Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Thu, 10 Apr 2025 15:15:07 +0000 Subject: [PATCH 15/17] Changing Energy NRM to Energy Information NRM --- OpenAPI/README.md | 6 +++--- ...0_EnergyNrm.yaml => TS28310_EnergyInformationNrm.yaml} | 8 ++++---- OpenAPI/TS28623_FeatureNrm.yaml | 2 +- OpenAPI/TS28623_GenericNrm.yaml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) rename OpenAPI/{TS28310_EnergyNrm.yaml => TS28310_EnergyInformationNrm.yaml} (90%) diff --git a/OpenAPI/README.md b/OpenAPI/README.md index 792210f32..fc4363053 100644 --- a/OpenAPI/README.md +++ b/OpenAPI/README.md @@ -103,9 +103,9 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28318_DsoNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28318_DsoNrm.yaml)) -* Energy NRM (TS 28.310) -([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28310_EnergyEfficiencyNrm.yaml)) -([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28310_EnergyNrm.yaml)) +* Energy Information NRM (TS 28.310) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28310_EnergyInformationNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28310_EnergyInformationNrm.yaml)) ## Management Services (MnS) diff --git a/OpenAPI/TS28310_EnergyNrm.yaml b/OpenAPI/TS28310_EnergyInformationNrm.yaml similarity index 90% rename from OpenAPI/TS28310_EnergyNrm.yaml rename to OpenAPI/TS28310_EnergyInformationNrm.yaml index 71d71efe2..4707e939b 100644 --- a/OpenAPI/TS28310_EnergyNrm.yaml +++ b/OpenAPI/TS28310_EnergyInformationNrm.yaml @@ -1,13 +1,13 @@ openapi: 3.0.1 info: - title: EE NRM + title: Energy Information NRM version: 19.0.0 description: >- - OAS 3.0.1 specification of the Energy NRM + OAS 3.0.1 specification of the Energy Information NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.310; Energy NRM + description: 3GPP TS 28.310; Energy Information NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.310/ paths: {} components: @@ -84,7 +84,7 @@ components: #--------------------------------- Definition ------------------------------------ - resources-energyNrm: + resources-energyInformationNrm: oneOf: - $ref: '#/components/schemas/EnergySupplyInfo-Single' - $ref: '#/components/schemas/EnergyInfoGroup-Single' diff --git a/OpenAPI/TS28623_FeatureNrm.yaml b/OpenAPI/TS28623_FeatureNrm.yaml index 09255b3ba..cb4a79611 100644 --- a/OpenAPI/TS28623_FeatureNrm.yaml +++ b/OpenAPI/TS28623_FeatureNrm.yaml @@ -36,6 +36,6 @@ components: - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm' - - $ref: 'TS28310_EnergyNrm.yaml#/components/schemas/resources-energyNrm' + - $ref: 'TS28310_EnergyInformationNrm.yaml#/components/schemas/resources-energyInformationNrm' #----- Definitions in TS 28.623 for TS 28.532 --------------------------# diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index b24d04c74..5d14811ec 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -604,7 +604,7 @@ components: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm' - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm' - - $ref: 'TS28310_EnergyNrm.yaml#/components/schemas/SubNetwork-ncO-EnergyNrm' + - $ref: 'TS28310_EnergyInformationNrm.yaml#/components/schemas/SubNetwork-ncO-EnergyInformationNrm' ManagedElement-Single: -- GitLab From 10643d5c687c6f039277ce9451d6a620b8be381f Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Thu, 10 Apr 2025 15:17:08 +0000 Subject: [PATCH 16/17] Changing Energy NRM to Energy Information NRM --- OpenAPI/TS28310_EnergyInformationNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28310_EnergyInformationNrm.yaml b/OpenAPI/TS28310_EnergyInformationNrm.yaml index 4707e939b..8ce1b2fd9 100644 --- a/OpenAPI/TS28310_EnergyInformationNrm.yaml +++ b/OpenAPI/TS28310_EnergyInformationNrm.yaml @@ -36,7 +36,7 @@ components: - LOCALLY_GENERATED_ENERGY #-------- Definition of concrete IOCs -------------------------------------------- - SubNetwork-ncO-EnergyNrm: + SubNetwork-ncO-EnergyInformationNrm: type: object properties: EnergySupplyInfo: -- GitLab From af8789e873b09300915928ab6cfa2770a70640e0 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Thu, 10 Apr 2025 15:28:58 +0000 Subject: [PATCH 17/17] Reverting unwanted change --- OpenAPI/TS28623_GenericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 5d14811ec..166494a52 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -684,4 +684,4 @@ components: - $ref: '#/components/schemas/ConditionMonitor-Single' - $ref: '#/components/schemas/SupportedNotifications-Single' - $ref: '#/components/schemas/SubNetwork-Single' - - $ref: '#/components/schemas/ManagedElement-Single' \ No newline at end of file + - $ref: '#/components/schemas/ManagedElement-Single' -- GitLab