Commit b30d6069 authored by srinivasaraj's avatar srinivasaraj
Browse files

Changes to address review comments during the meeting.

parent 0e31081a
Loading
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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)
+5 −12
Original line number Diff line number Diff line
@@ -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'        
+1 −1
Original line number Diff line number Diff line
@@ -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 --------------------------#   
+2 −26
Original line number Diff line number Diff line
@@ -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 ---------------------------------
@@ -708,4 +685,3 @@ components:
       - $ref: '#/components/schemas/SupportedNotifications-Single' 
       - $ref: '#/components/schemas/SubNetwork-Single'
       - $ref: '#/components/schemas/ManagedElement-Single'
 No newline at end of file
       - $ref: '#/components/schemas/GenericCollection-Single'
 No newline at end of file