Commit 5391470d authored by lengyelb's avatar lengyelb
Browse files

Merge branch... 

Merge branch '28.541_Rel17_CR0555_Remove_isINEF_attribute_from_NEFFunction_IOC' into 'Integration_Rel17_SA5_138_YANG'

28.541 rel17 CR0555 remove is inef attribute from nef function ioc

See merge request !182
parents e2af1710 f06f97ef

OpenAPI/5gcNrm.yaml

+29 −24
Original line number Diff line number Diff line
@@ -265,26 +265,7 @@ components: 
          type: integer

        exponent:

          type: integer

    FiveQICharacteristics:

      type: object

      properties:

        fiveQIValue:

          type: integer

        resourceType:

          type: string

          enum:

            - GBR

            - NonGBR

        priorityLevel:

          type: integer

        packetDelayBudget:

          type: integer

        packetErrorRate:

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

        averagingWindow:

          type: integer

        maximumDataBurstVolume:

          type: integer







    GtpUPathDelayThresholdsType:
@@ -1101,8 +1082,6 @@ components: 
                      $ref: '#/components/schemas/ManagedNFProfile'

                    capabilityList:

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

                    isINEF:

                      type: boolean

                    isCAPIFSup:

                      type: boolean

        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
@@ -1637,6 +1616,32 @@ components: 
                      items:

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



    FiveQICharacteristics-Single:

      allOf:

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

        - type: object

          properties:

            fiveQIValue:

              type: integer

            resourceType:

              type: string

              enum:

                - GBR

                - NonGBR

            priorityLevel:

              type: integer

            packetDelayBudget:

              type: integer

            packetErrorRate:

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

            averagingWindow:

              type: integer

            maximumDataBurstVolume:

              type: integer

    FiveQICharacteristics-Multiple:

      type: array

      items:

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

    Configurable5QISet-Single:

      allOf:

        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
@@ -1649,7 +1654,7 @@ components: 
                    configurable5QIs:

                      type: array

                      items:

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

                        $ref: '#/components/schemas/FiveQICharacteristics-Multiple'  

   

    Dynamic5QISet-Single:

      allOf:
@@ -1663,7 +1668,7 @@ components: 
                    dynamic5QIs:

                      type: array

                      items:

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

                        $ref: '#/components/schemas/FiveQICharacteristics-Multiple'                           

                      

    GtpUPathQoSMonitoringControl-Single:

      allOf:

OpenAPI/genericNrm.yaml

+16 −0
Original line number Diff line number Diff line
@@ -1206,6 +1206,10 @@ components: 
          $ref: '#/components/schemas/TraceJob-Multiple'

        AlarmList:

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

        MnsRegistry:

          type: array

          items:

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

    ManagedElement-ncO:

      type: object

      properties:
@@ -1342,6 +1346,18 @@ components: 
        TraceJob:

          $ref: '#/components/schemas/TraceJob-Multiple'



    MnsRegistry:

      type: object

      properties:

        mnsLabel:

          type: string

        mnsType:

          type: string

        mnsVersion:

          type: string

        mnsAddress:

          type: string



#-------- Definition of concrete IOCs --------------------------------------------



    VsDataContainer-Single:

OpenAPI/sliceNrm.yaml

+16 −2
Original line number Diff line number Diff line
@@ -466,6 +466,18 @@ components: 
        - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr'

        - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr'

    

    LogicInterfaceInfo:

      type: object

      properties:

         logicalInterfceType:

           type: string

           enum: 

            - VLAN

            - MPLS

            - Segment

         logicalInterfceId:

           type: string



    ServiceProfileList:

       type: array

       items:
@@ -538,6 +550,8 @@ components: 
                      $ref: '#/components/schemas/SliceProfileList'

                    epTransportRefList:

                      $ref: 'genericNrm.yaml#/components/schemas/DnList'

                    priorityLabel:

                      type: integer



    EP_Transport-Single:

      allOf:
@@ -549,8 +563,8 @@ components: 
              properties:

                ipAddress:

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

                logicInterfaceId:

                  type: string 

                logicInterfaceInfo:

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

                nextHopInfo:

                  type: string 

                qosProfile:

yang-models/_3gpp-5gc-nrm-neffunction.yang

+0 −4
Original line number Diff line number Diff line
@@ -44,10 +44,6 @@ module _3gpp-5gc-nrm-neffunction { 
      type string;

    }

    

    leaf isINEF {

      type boolean;

    }

    

    leaf isCAPIFSup {

      type boolean;

    }