Commit 9b677718 authored by sunse's avatar sunse
Browse files

Merge branch 'Integration_Rel17_SA5_139_YAML' into 'Integration_Rel17_SA5_140_YAML'

merge all content of 139 integration branch to 140 integration branch

See merge request sa5/MnS!245
parents ff434c0d 0a48090e
Loading
Loading
Loading
Loading
+8 −4
Original line number Diff line number Diff line
@@ -220,7 +220,8 @@ components:
            $ref: 'genericNrm.yaml#/components/schemas/NFType'
        allowedNfDomains:
          type: array
          items: string
          items: 
            type: string
        allowedNSSAIs:
          type: array
          items:
@@ -233,17 +234,20 @@ components:
          type: integer
        nfSetIdList:
          type: array
          items: string
          items:
            type: string
        servingScope:
          type: array
          items: string
          items:
            type: string
        nfSetRecoveryTimeList:
          type: array
          items:
            $ref: 'comDefs.yaml#/components/schemas/DateTime'
        scpDomains:
          type: array
          items: string
          items:
            type: string
        vendorId:
          type: string
    SEPPType:
+23 −0
Original line number Diff line number Diff line
@@ -671,6 +671,8 @@ components:
              $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
            DMROFunction:
              $ref: '#/components/schemas/DMROFunction-Single'
            DLBOFunction:
              $ref: '#/components/schemas/DLBOFunction-Single'
            DPCIConfigurationFunction:
              $ref: '#/components/schemas/DPCIConfigurationFunction-Single'
            CPCIConfigurationFunction:
@@ -706,6 +708,8 @@ components:
              $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
            DMROFunction:
              $ref: '#/components/schemas/DMROFunction-Single'
            DLBOFunction:
              $ref: '#/components/schemas/DLBOFunction-Single'
            DPCIConfigurationFunction:
              $ref: '#/components/schemas/DPCIConfigurationFunction-Single'
            CPCIConfigurationFunction:
@@ -873,6 +877,8 @@ components:
              $ref: '#/components/schemas/DESManagementFunction-Single'
            DMROFunction:
              $ref: '#/components/schemas/DMROFunction-Single'
            DLBOFunction:
              $ref: '#/components/schemas/DLBOFunction-Single'

    NrCellCu-Single:
      allOf:
@@ -907,6 +913,8 @@ components:
              $ref: '#/components/schemas/DESManagementFunction-Single'
            DMROFunction:
              $ref: '#/components/schemas/DMROFunction-Single'
            DLBOFunction:
              $ref: '#/components/schemas/DLBOFunction-Single'
            CESManagementFunction:
              $ref: '#/components/schemas/CESManagementFunction-Single'
            DPCIConfigurationFunction:
@@ -1413,6 +1421,20 @@ components:
                      $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange'
                    tstoreUEcntxt:
                      $ref: '#/components/schemas/TstoreUEcntxt'
    DLBOFunction-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes: 
                  type: object
                  properties:
                    dlboControl:
                      type: boolean
                    maximumDeviationHoTrigger:
                          $ref: '#/components/schemas/MaximumDeviationHoTrigger'
                    minimumTimeBetweenHoTriggerChange:
                          $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange'

    DPCIConfigurationFunction-Single:
      allOf:
@@ -1969,6 +1991,7 @@ components:
        - $ref: '#/components/schemas/DESManagementFunction-Single'
        - $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
        - $ref: '#/components/schemas/DMROFunction-Single'
        - $ref: '#/components/schemas/DLBOFunction-Single'        
        - $ref: '#/components/schemas/DPCIConfigurationFunction-Single'
        - $ref: '#/components/schemas/CPCIConfigurationFunction-Single'
        - $ref: '#/components/schemas/CESManagementFunction-Single'