Commit 48d3756f authored by sunse's avatar sunse
Browse files

Merge branch 'Integration_Rel19_SA5_154_YAML' into 'Integration_Rel19_SA5_155_YAML'

Rel18 integration branch contents from 154 meeting merge to Rel19 YAML integration branch

See merge request !1112
parents c14b3e14 d8e7cf43
Loading
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -643,26 +643,32 @@ components:
      properties:
        positionX:
          type: integer
          default: 0
          minimum: 0
          maximum: 604800
        positionY:
          type: integer
          default: 0          
          minimum: 0
          maximum: 604800
        positionZ:
          type: integer
          default: 0          
          minimum: 0
          maximum: 604800
        velocityVX:
          type: integer
          default: 0          
          minimum: -131072
          maximum: 131071         
        velocityVY:
          type: integer
          default: 0          
          minimum: -131072
          maximum: 131071           
        velocityVZ:
          type: integer
          default: 0          
          minimum: -131072
          maximum: 131071

@@ -671,26 +677,32 @@ components:
      properties:
          semiMajorAxis:
            type: integer
            default: 0            
            minimum: 0
            maximum: 8589934591 
          eccentricity:
            type: integer
            default: 0                 
            minimum: -524288
            maximum: 524287
          periapsis:
            type: integer
            default: 0     
            minimum: 0
            maximum: 16777215
          longitude:
            type: integer
            default: 0                 
            minimum: 0
            maximum: 2097151
          inclination:
            type: integer
            default: 0                 
            minimum: -524288
            maximum: 524287
          meanAnomaly:
            type: integer
            default: 0                 
            minimum: 0
            maximum: 16777215

+7 −7
Original line number Diff line number Diff line
@@ -141,13 +141,13 @@ components:
    NFServiceType:
      type: string
      enum:
        - Namf_Communication
        - Namf_EventExposure
        - Namf_MT
        - Namf_Location
        - Nsmf_PDUSession
        - Nsmf_EventExposure
        - Others
        - NAMF_COMMUNICATION
        - NAMF_EVENTEXPOSURE
        - NAMF_MT
        - NAMF_LOCATION
        - NSMF_PDUSESSION
        - NSMF_EVENTEXPOSURE
        - OTHERS
    TransportProtocol:
      anyOf:
        - type: string
+4 −4
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ components:
             mnsType:
               type: string
               enum:
                 - ProvMnS
                 - FaultSupervisionMnS
                 - StreamingDataReportingMnS
                 - FileDataReportingMnS
                 - PROV_MNS
                 - FAULT_SUPERVISION_MNS
                 - STREAMING_DATA_REPORTING_MNS
                 - FILE_DATA_REPORTING_MNS
             mnsVersion:
               type: string
             mnsAddress:
+123 −123
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ components:
            type: string
            enum:
              - A
              - Iu-CS
              - Mc
              - IU-CS
              - MC
              - MAP-G
              - MAP-B
              - MAP-E
@@ -54,33 +54,33 @@ components:
          items:
            type: string
            enum:
              - Mc
              - Nb-UP
              - Iu-UP
              - MC
              - NB-UP
              - IU-UP
        RNCInterfaces:
          type: array
          items:
            type: string
            enum:
              - Iu-CS
              - Iu-PS
              - Iur
              - Iub
              - Uu
              - IU-CS
              - IU-PS
              - IUR
              - IUB
              - UU
        SGSNInterfaces:
          type: array
          items:
            type: string
            enum:
              - Gb
              - Iu-PS
              - Gn
              - MAP-Gr
              - MAP-Gd
              - MAP-Gf
              - Ge
              - Gs
              - S6d
              - GB
              - IU-PS
              - GN
              - MAP-GR
              - MAP-GD
              - MAP-GF
              - GE
              - GS
              - S6D
              - S4
              - S3
              - S13
@@ -89,34 +89,34 @@ components:
          items:
            type: string
            enum:
              - Gn
              - Gi
              - Gmb
              - GN
              - GI
              - GMB
        S-CSCFInterfaces:
          type: array
          items:
            type: string
            enum:
              - Mw
              - Mg
              - Mr
              - Mi
              - MW
              - MG
              - MR
              - MI
        P-CSCFInterfaces:
          type: array
          items:
            type: string
            enum:
              - Gm
              - Mw
              - GM
              - MW
        I-CSCFInterfaces:
          type: array
          items:
            type: string
            enum:
              - Cx
              - Dx
              - Mg
              - Mw
              - CX
              - DX
              - MG
              - MW
        MRFCInterfaces:
          type: array
          items:
@@ -129,42 +129,42 @@ components:
          items:
            type: string
            enum:
              - Mg
              - Mj
              - Mn
              - MG
              - MJ
              - MN
        IBCFInterfaces:
          type: array
          items:
            type: string
            enum:
              - Ix
              - Mx
              - IX
              - MX
        E-CSCFInterfaces:
          type: array
          items:
            type: string
            enum:
              - Mw
              - Ml
              - Mm
              - Mi/Mg
              - MW
              - ML
              - MM
              - MI/MG
        BGCFInterfaces:
          type: array
          items:
            type: string
            enum:
              - Mi
              - Mj
              - Mk
              - MI
              - MJ
              - MK
        ASInterfaces:
          type: array
          items:
            type: string
            enum:
              - Dh
              - Sh
              - DH
              - SH
              - ISC
              - Ut
              - UT
        HSSInterfaces:
          type: array
          items:
@@ -172,12 +172,12 @@ components:
            enum:
              - MAP-C
              - MAP-D
              - Gc
              - Gr
              - Cx
              - S6d
              - S6a
              - Sh
              - GC
              - GR
              - CX
              - S6D
              - S6A
              - SH
              - N70
              - N71
              - NU1
@@ -188,13 +188,13 @@ components:
            enum:
              - MAP-F
              - S13
              - MAP-Gf
              - MAP-GF
        BM-SCInterfaces:
          type: array
          items:
            type: string
            enum:
              - Gmb
              - GMB
        MMEInterfaces:
          type: array
          items:
@@ -202,7 +202,7 @@ components:
            enum:
              - S1-MME
              - S3
              - S6a
              - S6A
              - S10
              - S11
              - S13
@@ -215,20 +215,20 @@ components:
              - S5
              - S8
              - S11
              - Gxc
              - GXC
        PDN_GWInterfaces:
          type: array
          items:
            type: string
            enum:
              - S2a
              - S2b
              - S2c
              - S2A
              - S2B
              - S2C
              - S5
              - S6b
              - Gx
              - S6B
              - GX
              - S8
              - SGi
              - SGI
        eNBInterfaces:
          type: array
          items:
@@ -243,7 +243,7 @@ components:
            enum:
              - S1-MME
              - X2
              - Uu
              - UU
              - F1-C
              - E1
        AMFInterfaces:
@@ -336,16 +336,16 @@ components:
            type: string
            enum:
              - NG-C
              - Xn-C
              - Uu
              - XN-C
              - UU
        gNB-CU-CPInterfaces:
          type: array
          items:
            type: string
            enum:
              - NG-C
              - Xn-C
              - Uu
              - XN-C
              - UU
              - F1-C
              - E1
              - X2-C
@@ -457,9 +457,9 @@ components:
            - UTRAN_CELL
            - E-UTRAN_CELL
            - NG-RAN_CELL
            - eNB
            - ENB
            - RNC
            - gNB
            - GNB
            - SUPI
        TargetIdValue:
          type: string
@@ -478,7 +478,7 @@ components:
            enum:
              - MO_MT_CALLS
              - MO_MT_SMS
              - LU_IMSIattach_IMSIdetach
              - LU_IMSIATTACH_IMSIDETACH
              - HANDOVER
              - SS
        SGSN:
@@ -486,10 +486,10 @@ components:
          items:
            type: string
            enum:
              - PDPcontext
              - PDPCONTEXT
              - MO_MT_SMS
              - RAU_GPRSattach_GPRSdetach
              - MBMScontext
              - RAU_GPRSATTACH_GPRSDETACH
              - MBMSCONTEXT
        MGW:
          type: array
          items:
@@ -501,129 +501,129 @@ components:
          items:
            type: string
            enum:
              - PDPcontext
              - MBMScontext
              - PDPCONTEXT
              - MBMSCONTEXT
        IMS:
          type: array
          items:
            type: string
            enum:
              - SIPsession_StandaloneTransaction
              - SIPSESSION_STANDALONETRANSACTION
        BM_SC:
          type: array
          items:
            type: string
            enum:
              - MBMSactivation
              - MBMSACTIVATION
        MME:
          type: array
          items:
            type: string
            enum:
              - UEinitiatedPDNconnectivityRequest
              - ServiceRequest
              - InitialAttach_TAU_Detach
              - UEinitiatedPDNdisconnection
              - BearerActivationModificationDeletion
              - Handover
              - UE_INITIATEDPDN_CONNECTIVITY_REQUEST
              - SERVICE_REQUEST
              - INITIALATTACH_TAU_DETACH
              - UE_INITIATEDPDN_DISCONNECTION
              - BEAR_ACTIVIATION_MODIFICATION_DELETION
              - HANDOVER
        SGW:
          type: array
          items:
            type: string
            enum:
              - PDNconnectionCreation
              - PDNconnectionTermination
              - BearerActivationModificationDeletion
              - PDN_CONNECTION_CREATION
              - PDN_CONNECTION_TERMINATION
              - BEAR_ACTIVATION_MODIFICATION_DELETION
        PGW:
          type: array
          items:
            type: string
            enum:
              - PDNconnectionCreation
              - PDNconnectionTermination
              - BearerActivationModificationDeletion
              - PDN_CONNECTION_CREATION
              - PDN_CONNECTION_TERMINATION
              - BEAR_ACTIVATION_MODIFICATION_DELETION
        AMF:
          type: array
          items:
            type: string
            enum:
              - Registration
              - ServiceRequest
              - Handover
              - UEderegistration
              - NetworkDeregistration
              - UEMobilityFromEPC
              - UEMobilityToEPC
              - REGISTRATION
              - SERVICE_REQUEST
              - HANDOVER
              - UE_DEREGISTRATION
              - NETWORK_DEREGISTRATION
              - UE_MOBILITY_FROM_EPC
              - UE_MOBILITY_TO_EPC
        SMF:
          type: array
          items:
            type: string
            enum:
              - PDUsessionEstablishment
              - PDUsessionModification
              - PDUsessionRelease
              - PDUsessionUPactivationDeactivation
              - MobilityBtw3gppAndN3gppTo5GC
              - MobilityFromEpc
              - PDU_SESSION_ESTABLISHMENT
              - PDU_SESSION_MODIFICATION
              - PDU_SESSIOON_RELEASE
              - PDU_SESSION_UP_ACTIVATION_DEACTIVATION
              - MOBILITY_BTW_3GPP_AND_N3GPP_TO_5GC
              - MOBILITY_FROM_EPC
        PCF:
          type: array
          items:
            type: string
            enum:
              - AMpolicy
              - SMpolicy
              - Authorization
              - BDTpolicy
              - AM_POLICY
              - SM_POLICY
              - AUTHORIZATION
              - BDT_POLICY
        UPF:
          type: array
          items:
            type: string
            enum:
              - N4Session
              - N4SESSION
        AUSF:
          type: array
          items:
            type: string
            enum:
              - UEauthentication
              - UE_AUTHENTICATION
        NEF:
          type: array
          items:
            type: string
            enum:
              - EventExposure
              - PFDmanagement
              - ParameterProvision
              - Trigger
              - EVENT_EXPOSURE
              - PFD_MANAGEMENT
              - PARAMETER_PROVISION
              - TRIGGER
        NRF:
          type: array
          items:
            type: string
            enum:
              - NFmanagement
              - NFdiscovery
              - NF_MANAGEMEENT
              - NF_DISCOVERY
        NSSF:
          type: array
          items:
            type: string
            enum:
              - NSSelection
              - NS_SELECTION
              - NSSAI
        SMSF:
          type: array
          items:
            type: string
            enum:
              - SMservice
              - SMSERVICE
        UDM:
          type: array
          items:
            type: string
            enum:
              - UEcontext
              - SubscriberData
              - UEauthentication
              - EventExposure
              - UE_CONTEXT
              - SUBSCRIBER_DATA
              - UE_AUTHENTICATION
              - EVENT_EXPOSURE
    
    anonymizationOfMdtData-Type:
      description: Specifies level of MDT anonymization. For additional details see 3GPP TS 32.422 clause 5.10.12.
@@ -940,9 +940,9 @@ components:
      description: See details in 3GPP TS 32.422 clause 5.10.15.
      type: string
      enum:
        - CPICH_EcNo
        - CPICH_ECNO
        - CPICH_RSCP
        - PathLoss
        - PATHLOSS

    eventThresholdUphUmts-Type:
      description: See details in 3GPP TS 32.422 clause 5.10.A.