Commit 7e531a59 authored by sunse's avatar sunse
Browse files

Merge branch... 

Merge branch 'Rel_19_CR1380_28.541_OpenAPI_SS_Stage_3_for_energy_cost_mapping_rule' into 'Integration_Rel19_SA5_157_YAML'

Rel_19_CR1380_28.541_OpenAPI_SS_Stage_3_for_energy_cost_mapping_rule

See merge request !1420
parents f96aeae0 8fd289d3

OpenAPI/TS28541_NrNrm.yaml

+23 −1
Original line number Diff line number Diff line
@@ -991,6 +991,8 @@ components: 
                      $ref: '#/components/schemas/QceIdMappingInfoList'

                    mdtUserConsentReqList:

                      $ref: '#/components/schemas/MdtUserConsentReqList'

                    nRECMappingRuleRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'

        - type: object

          properties:
@@ -2101,6 +2103,22 @@ components: 
                    ephemerisInfos:

                      $ref: '#/components/schemas/EphemerisInfos'



    NRECMappingRule-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'

        - type: object

          properties:

            attributes:

              allOf:

                - type: object

                  properties:

                    ecMRInputMinimumValue:

                      type: integer

                    ecMRInputMaximumValue:

                      type: integer

                    ecTimeInterval:

                      type: integer



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



    GnbDuFunction-Multiple:
@@ -2259,6 +2277,10 @@ components: 
      type: array

      items:

        $ref: '#/components/schemas/EphemerisInfoSet-Single'

    NRECMappingRule-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/NRECMappingRule-Single'



#-------- Definitions in TS 28.541 for TS 28.532 ---------------------------------
@@ -2326,4 +2348,4 @@ components: 
        - $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single'

        - $ref: '#/components/schemas/NTNFunction-Single'

        - $ref: '#/components/schemas/EphemerisInfoSet-Single'

        - $ref: '#/components/schemas/NRECMappingRule-Single'