Commit 1f9df323 authored by ruiyue's avatar ruiyue
Browse files

Update 3 files 

- /OpenAPI/TS28623_ComDefs.yaml
- /OpenAPI/TS28541_SliceNrm.yaml
- /OpenAPI/TS28541_NrNrm.yaml
parent 67ed0893

OpenAPI/TS28541_NrNrm.yaml

+7 −1
Original line number Diff line number Diff line
@@ -97,9 +97,15 @@ components: 
      items:

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

    TaiList:

      description: This datatype is used for writable attribute

      type: array

      items:

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

    TaiListRo:

      description: This datatype is used for readOnly attribute

      type: array

      items:

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

    BackhaulAddress:

      type: object

      properties:

OpenAPI/TS28541_SliceNrm.yaml

+21 −8
Original line number Diff line number Diff line
@@ -69,14 +69,17 @@ components: 
      enum:

        - CHARACTER

        - SCALABILITY

      readOnly: true  

    Tagging:

      type: array

      readOnly: true

      items:

        type: string

        enum:

          - PERFORMANCE

          - FUNCTION

          - OPERATION

        readOnly: true  

    Exposure:

      type: string

      enum:
@@ -96,6 +99,7 @@ components: 
      enum:

        - NOT_SUPPORTED

        - SUPPORTED

      readOnly: true  

    DelayTolerance:

      type: object

      properties:
@@ -127,9 +131,9 @@ components: 
        servAttrCom:

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

        guaThpt:

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

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

        maxThpt:

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

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

    MaxPktSize:

      type: object

      properties:
@@ -144,6 +148,7 @@ components: 
          $ref: '#/components/schemas/ServAttrCom'

        nOofPDUSessions:

          type: integer

          readOnly: true

    KPIMonitoring:

      type: object

      properties:
@@ -153,6 +158,7 @@ components: 
          type: array

          items:

            type: string

          readOnly: true  

    NBIoT:

      type: object

      properties:
@@ -210,13 +216,16 @@ components: 
          $ref: '#/components/schemas/ServAttrCom'

        density:

          type: integer

          readOnly: true

    NsInfo:

      type: object

      properties:

        nsInstanceId:

          type: string

          readOnly: true

        nsName:

          type: string

          readOnly: true

        description:

          type: string

    EmbbEEPerfReq:
@@ -273,12 +282,14 @@ components: 
      properties:

        secFunId:

          type: string

          readOnly: true

        secFunType:

          type: string

        secRules:

          type: array

          items:

            type: string

          readOnly: true  

    N6Protection:

      type: object

      properties:
@@ -578,6 +589,7 @@ components: 
      properties:

          serviceProfileId: 

            type: string

            readOnly: true

          plmnInfoList:

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

          maxNumberofUEs:
@@ -674,6 +686,7 @@ components: 
      properties:

          sliceProfileId: 

            type: string

            readOnly: true

          plmnInfoList:

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

          cNSliceSubnetProfile:
@@ -836,7 +849,7 @@ components: 
                - type: object

                  properties:

                    networkSliceSubnetRef:

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

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

                    operationalState:

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

                    administrativeState:
@@ -844,7 +857,7 @@ components: 
                    serviceProfileList:

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

                    networkSliceControllerRef:

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

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

                    isolationProfileRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
@@ -858,9 +871,9 @@ components: 
                - type: object

                  properties:

                    managedFunctionRefList:

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

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

                    networkSliceSubnetRefList:

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

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

                    operationalState:

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

                    administrativeState:
@@ -880,7 +893,7 @@ components: 
                        - RAN_SLICESUBNET

                        - CN_SLICESUBNET

                    networkSliceSubnetControllerRef:

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

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

                    isolationProfileRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
@@ -893,7 +906,7 @@ components: 
              type: object

              properties:

                ipAddress:

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

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

                localLogicalInterfaceInfo:

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

                qosProfile:

OpenAPI/TS28623_ComDefs.yaml

+38 −0
Original line number Diff line number Diff line
@@ -14,8 +14,14 @@ components: 
  schemas:

  

    Float:

      description: This datatype is used for writable attribute

      type: number

      format: float

    FloatRo:

      description: This datatype is used for readOnly attribute

      type: number

      format: float

      readOnly: true      

    DateTime:

      description: This datatype is used for writable attribute

      type: string
@@ -194,26 +200,58 @@ components: 
      readOnly: true



    Ipv4Addr:

      description: This datatype is used for writable attribute

      type: string

      pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$'

      example: '198.51.100.1'

    Ipv4AddrRo:

      description: This datatype is used for readOnly attribute

      type: string

      pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$'

      example: '198.51.100.1' 

      readOnly: true     

    Ipv6Addr:

      description: This datatype is used for writable attribute

      type: string

      allOf:

        - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$'

        - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$'

      example: '2001:db8:85a3::8a2e:370:7334'

    Ipv6AddrRo:

      description: This datatype is used for readOnly attribute

      type: string

      allOf:

        - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$'

        - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$'

      example: '2001:db8:85a3::8a2e:370:7334'

      readOnly: true      

    Ipv6Prefix:

      description: This datatype is used for writable attribute

      type: string

      allOf:

        - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$'

        - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$'

      example: '2001:db8:abcd:12::0/64'

    Ipv6PrefixRo:

      description: This datatype is used for readOnly attribute

      type: string

      allOf:

        - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$'

        - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$'

      example: '2001:db8:abcd:12::0/64'

      readOnly: true      

    IpAddr:

      description: This datatype is used for writable attribute

      oneOf:

        - $ref: '#/components/schemas/Ipv4Addr'

        - $ref: '#/components/schemas/Ipv6Addr'

        - $ref: '#/components/schemas/Ipv6Prefix'

    IpAddrRo:

      description: This datatype is used for readOnly attribute

      oneOf:

        - $ref: '#/components/schemas/Ipv4AddrRo'

        - $ref: '#/components/schemas/Ipv6AddrRo'

        - $ref: '#/components/schemas/Ipv6PrefixRo'        

    HostAddr:

      #  This definition will be deprecated, when all occurances of HostAddr

      #  are replaced by Host.