Commit 012fda10 authored by srinivasaraj's avatar srinivasaraj
Browse files

Rel_19_TS28623-CR0375_TS28541_CR1279_Add_support_for_Energy_Cost_mapping_rule

parent 8f502245
Loading
Loading
Loading
Loading
Loading
+69 −1
Original line number Diff line number Diff line
@@ -771,6 +771,12 @@ components:
          $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple'
        CCOFunction:
          $ref: '#/components/schemas/CCOFunction-Single'
        NREnergySavingsGroup:
          $ref: '#/components/schemas/NREnergySavingsGroup-Multiple'
        NRECMappingPolicy:
          $ref: '#/components/schemas/NRECMappingPolicy-Multiple'
        NRECMappingRule:
          $ref: '#/components/schemas/NRECMappingRule-Multiple'

    ManagedElement-ncO-NrNrm:
      type: object
@@ -836,6 +842,8 @@ components:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    dynamic5QISetRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    groupReferences:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
          properties:
@@ -907,6 +915,8 @@ components:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    dynamic5QISetRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    groupReferences:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
          properties:
@@ -979,6 +989,8 @@ components:
                      $ref: '#/components/schemas/QceIdMappingInfoList'
                    mdtUserConsentReqList:
                      $ref: '#/components/schemas/MdtUserConsentReqList'
                    groupReferences:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
          properties:
@@ -2043,6 +2055,48 @@ components:
                    ephemerisInfos:
                      $ref: '#/components/schemas/EphemerisInfos'

    NREnergySavingsGroup-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/GenericCollection-Single'

    NRECMappingPolicy-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              type: object
              properties:
                userLabel:
                  type: string
                eCTimeInterval:
                  type: integer
                eCMappingRuleRefList:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                targetedNrGroups:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

    NRECMappingRule-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              type: object
              properties:
                userLabel:
                  type: string
                componentType:
                  type: string
                  enum:
                    - ENERGY_CONSUMPTION
                minimumValue:
                  type: integer
                maximumValue:
                  type: integer
                weight:
                  type: integer

#-------- Definition of JSON arrays for name-contained IOCs ----------------------

    GnbDuFunction-Multiple:
@@ -2201,6 +2255,18 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/EphemerisInfoSet-Single'
    NREnergySavingsGroup-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/NREnergySavingsGroup-Single'
    NRECMappingPolicy-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/NRECMappingPolicy-Single'
    NRECMappingRule-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/NRECMappingRule-Single'

#-------- Definitions in TS 28.541 for TS 28.532 ---------------------------------

@@ -2265,4 +2331,6 @@ components:
        - $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single'
        - $ref: '#/components/schemas/NTNFunction-Single'
        - $ref: '#/components/schemas/EphemerisInfoSet-Single'
        - $ref: '#/components/schemas/NREnergySavingsGroup-Single'
        - $ref: '#/components/schemas/NRECMappingPolicy-Single'
        - $ref: '#/components/schemas/NRECMappingRule-Single'