Commit d1067112 authored by sunse's avatar sunse
Browse files

Merge branch... 

Merge branch 'Rel_18_CR1379_28.541_OpenAPI_SS_Stage_3_for_energy_cost_mapping_rule' into 'Integration_Rel18_SA5_157_YAML'

Rel_18_CR1379_28.541_OpenAPI_SS_Stage_3_for_energy_cost_mapping_rule

See merge request !1416
parents 6bca933f a5896ca0

OpenAPI/TS28541_NrNrm.yaml

+23 −0
Original line number Diff line number Diff line
@@ -947,6 +947,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:
@@ -2049,6 +2051,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:
@@ -2207,6 +2225,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 ---------------------------------
@@ -2274,4 +2296,5 @@ components: 
        - $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single'

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

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

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