Commit 107bc3b3 authored by ruiyue's avatar ruiyue
Browse files

Merge branch 'Manual_Rebase_For_MR1029_TS28.541_CR1160' into 'Integration_Rel18_SA5_153_YAML' 

Manual rebase for mr1029 ts28.541 cr1160

See merge request !1050
parents 0edaedee e2febc21

OpenAPI/TS28541_5GcNrm.yaml

+11 −1
Original line number Diff line number Diff line
@@ -2761,6 +2761,14 @@ components: 
          minItems: 1

      required:

        - msisdnRanges

    SliceExpiryInfo :

      description: Slice validity

      type: object

      properties:

        pLMNInfo:

          $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfo'

        expiryTime:

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

    PcscfInfo:

      description: Information of a P-CSCF NF Instance

      type: object
@@ -2957,6 +2965,8 @@ components: 
                      $ref: '#/components/schemas/NTNPLMNRestrictionsInfo'

                    amfInfo:

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

                    sliceExpiryInfo:

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

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

        - type: object

          properties:

OpenAPI/TS28541_NrNrm.yaml

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ components: 
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

        snssai:

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

        sliceExpiryTime:

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

    PlmnInfoList:

      type: array

      items:

OpenAPI/TS28541_SliceNrm.yaml

+7 −1
Original line number Diff line number Diff line
@@ -414,6 +414,8 @@ components: 
          $ref: '#/components/schemas/Float'

        uLPktDelayVariation:

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

        sliceSubnetAvailability:

          $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime'



    RANSliceSubnetProfile:

      type: object
@@ -568,6 +570,8 @@ components: 
          $ref: '#/components/schemas/Float'

        uLPktDelayVariation:

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

        sliceSubnetAvailability:

          $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime'



    ServiceProfile:

      type: object
@@ -662,6 +666,8 @@ components: 
            $ref: '#/components/schemas/Float'

          uLPktDelayVariation:

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

          sliceAvailability:

            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime'



    SliceProfile:

      type: object