Commit 3bb6defe authored by ruiyue's avatar ruiyue
Browse files

Merge branch 'Integration_Rel17_SA5_143_YAML' into... 

Merge branch 'Integration_Rel17_SA5_143_YAML' into 'TS28.541_Rel17_S5-222245_Add_feasibility_check_NRM_fragment'

# Conflicts:
#   OpenAPI/sliceNrm.yaml
parents ded05d42 b1ecdfb4

OpenAPI/5gcNrm.yaml

+45 −21
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ components: 
        allowedSNPNs:

          type: array

          items:

            $ref: 'nrNrm.yaml#/components/schemas/SnpnInfo'

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

        allowedNfTypes:

          type: array

          items:
@@ -440,7 +440,7 @@ components: 
        mulAccCtrl:

          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/MulticastAccessControl'

        snssaiList:

          $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

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



    TrafficControlDataList:

      type: array
@@ -619,6 +619,30 @@ components: 
          type: string

        uPFRef:

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

    SnssaiList:

      type: array

      items:

        $ref: 'nrNrm.yaml#/components/schemas/Snssai'

    SnpnId:

      type: object

      properties:

        mcc:

          $ref: 'comDefs.yaml#/components/schemas/Mcc'

        mnc:

          $ref: 'comDefs.yaml#/components/schemas/Mnc'

        nid:

          type: string

    SnpnInfo:

      type: object

      properties:

        snpnId:

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

        snssai:

          $ref: 'nrNrm.yaml#/components/schemas/Snssai'

    TaiList:

      type: array

      items:

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



#-------- Definition of concrete IOCs --------------------------------------------
@@ -727,15 +751,15 @@ components: 
                    interPlmnFQDN:

                      type: string

                    taiList:

                      $ref: 'nrNrm.yaml#/components/schemas/TaiList'

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

                    taiRangeList:

                      type: array

                      items:

                        $ref: 'nrNrm.yaml#/components/schemas/TaiRange'

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

                    weightFactor:

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

                    snssaiList:

                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

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

                    cNSIIdList:

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

                    gUAMIdList:
@@ -800,7 +824,7 @@ components: 
                    amfSetId:

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

                    snssaiList:

                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

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

                    aMFRegionRef:

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

                    aMFSetMemberList:
@@ -822,7 +846,7 @@ components: 
                    amfRegionId:

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

                    snssaiList:

                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

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

                    aMFSetListRef:

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

    SmfFunction-Single:
@@ -852,7 +876,7 @@ components: 
                    taiRangeList:

                      type: array

                      items:

                        $ref: 'nrNrm.yaml#/components/schemas/TaiRange'

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

                    pwgFqdn:

                      type: string

                    pgwAddrList:
@@ -919,7 +943,7 @@ components: 
                    nRTACList:

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

                    snssaiList:

                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

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

                    managedNFProfile:

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

                    supportedBMOList:
@@ -973,7 +997,7 @@ components: 
                    sBIFqdn:

                      type: string

                    snssaiList:

                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

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

                    managedNFProfile:

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

                    commModelList:
@@ -1016,7 +1040,7 @@ components: 
                    sBIFqdn:

                      type: string

                    snssaiList:

                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

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

                    managedNFProfile:

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

                    commModelList:
@@ -1043,7 +1067,7 @@ components: 
                    sBIFqdn:

                      type: string

                    snssaiList:

                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

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

                    managedNFProfile:

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

                    commModelList:
@@ -1074,7 +1098,7 @@ components: 
                    sBIFqdn:

                      type: string

                    snssaiList:

                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

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

                    managedNFProfile:

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

    UdsfFunction-Single:
@@ -1092,7 +1116,7 @@ components: 
                    sBIFqdn:

                      type: string

                    snssaiList:

                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

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

                    managedNFProfile:

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

    NrfFunction-Single:
@@ -1114,7 +1138,7 @@ components: 
                    nFProfileList:

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

                    snssaiList:

                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

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

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

        - type: object

          properties:
@@ -1139,7 +1163,7 @@ components: 
                    nFProfileList:

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

                    snssaiList:

                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

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

                    commModelList:

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

        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
@@ -1212,7 +1236,7 @@ components: 
                    sBIFqdn:

                      type: string

                    snssaiList:

                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

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

                    managedNFProfile:

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

                    commModelList:
@@ -1260,7 +1284,7 @@ components: 
                    sBIFqdn:

                      type: string

                    snssaiList:

                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

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

                    managedNFProfile:

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

                    commModelList:
@@ -1296,7 +1320,7 @@ components: 
                    sBIFqdn:

                      type: string

                    snssaiList:

                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

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

                    managedNFProfile:

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

                    capabilityList:
@@ -1305,7 +1329,7 @@ components: 
                      type: boolean

                    taiList:

                      items:

                        $ref: 'nrNrm.yaml#/components/schemas/TaiList'

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

                    taiRangeList:

                      type: array

                      items:
@@ -1336,7 +1360,7 @@ components: 
                        $ref: '#/components/schemas/NsacfInfoSnssai'

                    taiList:

                      items:

                        $ref: 'nrNrm.yaml#/components/schemas/TaiList'

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

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

        - type: object

          properties:

OpenAPI/EdgeNRM.yaml

+16 −2
Original line number Diff line number Diff line
@@ -74,7 +74,15 @@ components: 
          type: integer

        swImageRef:

          type: string



    RegistrationInfo:

      type: object

      properties:

        registrationExpiry:

          type: string

        registrationID:

          type: string

        secCredential:

          type: string



#-------- Definition of concrete IOCs --------------------------------------------
@@ -128,8 +136,12 @@ components: 
                      type: string

                    eASRequirementsRef:

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

                    eESFunctionRef:

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

                    eASAddress:

                      type: string

                    registrationInfo:

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

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

    EESFunction-Single:

      allOf:
@@ -151,8 +163,10 @@ components: 
                      $ref: '#/components/schemas/SoftwareImageInfo'

                    serviceContinuitySupport:

                      type: boolean

                    eASFunctonRef:

                    eASFunctionRef:

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

                    registrationInfo:

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

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



    ECSFunction-Single:

OpenAPI/coslaNrm.yaml

+26 −4
Original line number Diff line number Diff line 
openapi: 3.0.2

openapi: 3.0.1



info:

  title: coslaNrm

  version: 16.4.0

  description: 

  version: 17.3.0

  description: >-

    OAS 3.0.1 specification of the Cosla NRM

    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).

    All rights reserved.



externalDocs:

  description: 3GPP TS 28.536 V16.4.0; Cosla NRM

  description: 3GPP TS 28.536 V17.3.0; Cosla NRM

  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.536/



paths: {}
@@ -72,6 +72,24 @@ components: 
      items:

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

     

    AttributeNameList:

      type: array

      items:

         type: string

          

    ACCLDisallowedAttributes:

      type: object

      properties:

        managedEntityIdentifier:

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

        attributeNameList:

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



    AssuranceScope:

      type: object

      properties:

        taiList:

          $ref: 'nrNrm.yaml#/components/schemas/TaiList'



#-------- Definition of concrete IOCs --------------------------------------------
@@ -117,6 +135,8 @@ components: 
                      $ref: 'comDefs.yaml#/components/schemas/AdministrativeState'

                    controlLoopLifeCyclePhase:

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

                    aCCLDisallowedList:

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

            AssuranceGoal:

              $ref: '#/components/schemas/AssuranceGoal-Multiple'
@@ -137,6 +157,8 @@ components: 
                      $ref: '#/components/schemas/AssuranceGoalStatusObserved'

                    assuranceGoalStatusPredicted:

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

                    assuranceScope:

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

                    serviceProfileId:

                      type: string

                    sliceProfileId:

OpenAPI/genericNrm.yaml

+280 −147

File changed.

Preview size limit exceeded, changes collapsed.

OpenAPI/intentNrm.yaml

+282 −20
Original line number Diff line number Diff line 
openapi: 3.0.2

openapi: 3.0.1

info:

  title: Intent NRM

  description: OAS 3.0.1 specification of the Intent NRM

  version: 17.0.0

  description: >-

    OAS 3.0.1 definition of the Intent NRM

    © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).

    All rights reserved.

externalDocs:

  description: 3GPP TS 28.312; Intent driven management services for mobile networks

  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.312/

paths: {}

components:

  schemas:
@@ -22,13 +28,15 @@ components: 
            type: array

            items:

              $ref: "#/components/schemas/IntentContext"

          intentFulfilStatus:

            $ref: "#/components/schemas/IntentFulfilStatus"

          intentFulfilmentInfo:

            $ref: "#/components/schemas/FulfilmentInfo"

    IntentExpectation:

      type: object

      properties:

        expectationId:

          type: string

        expectationVerb:

           $ref: "#/components/schemas/ExpectationVerb"

        expectationObjects:

          type: array

          items:
@@ -41,6 +49,8 @@ components: 
          type: array

          items:

            $ref: "#/components/schemas/ExpectationContext"

        expectationfulfilmentInfo:

            $ref: "#/components/schemas/FulfilmentInfo"

    

    ExpectationObject:

      type: object
@@ -48,7 +58,8 @@ components: 
        objectType:

          type: string

          enum:

            - RAN_SubNetwrok  #--value for Radio Network Expectation--#

            - RAN_SubNetwrok  #value for Radio Network Expectation--#

            - Service_Support  #value for Service Support Expectation--#

            - TBD    #-This will be added based on defined scenario specfic intent expectation-#

        objectInstance:

          $ref: "comDefs.yaml#/components/schemas/Dn"
@@ -67,7 +78,15 @@ components: 
        - $ref: "#/components/schemas/LowULRANUEThptRatioTarget"

        - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget"

      #--ExpectationTargets defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)- #   

      

      #--ExpectationTargets defind for Service Support Expectation (ObjectType is ServiceSupport)- #

        - $ref: "#/components/schemas/DLThptPerUETarget"

        - $ref: "#/components/schemas/ULThptPerUETarget"

        - $ref: "#/components/schemas/DLLatencyTarget"

        - $ref: "#/components/schemas/ULLatencyTarget"

        - $ref: "#/components/schemas/MaxNumberofUEsTarget"

        - $ref: "#/components/schemas/ActivityFactorTarget"

        - $ref: "#/components/schemas/UESpeedTarget"

     #--ExpectationTargets defind for Service Support Expectation (ObjectType is ServiceSupport)- #

      #--ExpectationTargets defind for other Scenario specific Expectation-----TBD---------------# 

      #--ExpectationTargets defind for other Scenario specific Expectation-----TBD---------------#
@@ -80,24 +99,25 @@ components: 
        - $ref: "#/components/schemas/PLMNContext"

        - $ref: "#/components/schemas/NRFqBandContext"

        - $ref: "#/components/schemas/RATContext"

      #--ObjectContext defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)------#   

      #--ObjectContext defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)-------#   

      #--ObjectContext defind for Service Support Expectation (ObjectType is ServiceSupport)-------#

        - $ref: "#/components/schemas/EdgeIdenfiticationIdContext"

        - $ref: "#/components/schemas/EdgeIdenfiticationLocContext"

        - $ref: "#/components/schemas/CoverageAreaTAContext"

      #--ObjectContext defind for Service Support Expectation (ObjectType is ServiceSupport)-------#



      #--ObjectContext defind for other Scenario specific Expectation -----------TBD------------#  

      #--ObjectContext defind for other Scenario specific Expectation -----------TBD------------#  



 



    ExpectationContext:

      type: object

      properties:

        contextAttribute:

          type: string

        contextCondition:

          $ref: "#/components/schemas/Condition"

        contextValueRange:

          type: array

          items:

            type: number

      oneOf:

     #--ExpectationContext defind for Service Support Expectation (ObjectType is Service_Support)- #

        - $ref: "#/components/schemas/ServiceStartTimeContext"

        - $ref: "#/components/schemas/ServiceEndTimeContext"

        - $ref: "#/components/schemas/UEMobilityLevelContext"

        - $ref: "#/components/schemas/ResourceSharingLevelContext"

     #--ExpectationContext defind for Service Support Expectation (ObjectType is Service_Support)- #   



    IntentContext:

      type: object
@@ -118,11 +138,42 @@ components: 
        - Is_greater_than

        - Is_within_the_range



    IntentFulfilStatus:

    FulfilStatus:

      type: string

      enum:

          - FULFILLED

          - NOT_FULFILLED



    NotFulfilledState:

      type: string

      enum:

          - ACKNOWLEDGED

          - COMPLIANT

          - DEGRADED

          - SUSPENDED

          - TERMINATED

          - FULFILMENTFAILED



    FulfilmentInfo:

      type: object

      properties:

        fulfilStatus:

          $ref: "#/components/schemas/FulfilStatus"

        notFullfilledState:

          description: ->

            An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo

          $ref: "#/components/schemas/NotFulfilledState"

        notFulfilledReasons:

          description: ->

            An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo

          type: string



    ExpectationVerb:

      type: string

      enum:

          - DELIVER

          - ENSURE



   #-------Definition of the concrete ExpectationTarget dataType----------#     

    WeakRSRPRatioTarget:

      type: object
@@ -141,6 +192,8 @@ components: 
          maximum: 100

        targetContexts:

          $ref: "#/components/schemas/WeakRSRPContext"

        targetFulfilmentInfo:

          $ref: "#/components/schemas/FulfilmentInfo"



    WeakRSRPContext:

      type: object
@@ -173,6 +226,8 @@ components: 
          maximum: 100

        targetContexts:

          $ref: "#/components/schemas/LowSINRContext"

        targetFulfilmentInfo:

          $ref: "#/components/schemas/FulfilmentInfo"



    LowSINRContext:

      type: object
@@ -201,6 +256,8 @@ components: 
            - Is_greater_than

        targetValueRange:

          type: integer

        targetFulfilmentInfo:

          $ref: "#/components/schemas/FulfilmentInfo"



    AveDLRANUEThptTarget:

      type: object
@@ -215,6 +272,8 @@ components: 
            - Is_greater_than

        targetValueRange:

          type: integer

        targetFulfilmentInfo:

          $ref: "#/components/schemas/FulfilmentInfo"



    LowULRANUEThptRatioTarget:

      type: object
@@ -233,6 +292,8 @@ components: 
          maximum: 100

        targetContexts:

          $ref: "#/components/schemas/LowULRANUEThptContext"

        targetFulfilmentInfo:

          $ref: "#/components/schemas/FulfilmentInfo"



    LowULRANUEThptContext:

      type: object
@@ -265,6 +326,8 @@ components: 
          maximum: 100

        targetContexts:

          $ref: "#/components/schemas/LowDLRANUEThptContext"

        targetFulfilmentInfo:

          $ref: "#/components/schemas/FulfilmentInfo"



    LowDLRANUEThptContext:

      type: object
@@ -279,6 +342,98 @@ components: 
            - Is_less_than

        contextValueRange:

          type: number

    DLThptPerUETarget:

      type: object

      properties:

        targetName:

          type: string

          enum:

            - DlThptPerUE

        targetCondition:

          type: string

          enum:

            - Is_greater_than

        targetValueRange:

          $ref: "sliceNrm.yaml#/components/schemas/XLThpt"

    ULThptPerUETarget:

      type: object

      properties:

        targetName:

          type: string

          enum:

            - UlThptPerUE

        targetCondition:

          type: string

          enum:

            - Is_greater_than

        targetValueRange:

          $ref: "sliceNrm.yaml#/components/schemas/XLThpt"

    DLLatencyTarget:

      type: object

      properties:

        targetName:

          type: string

          enum:

            - DlLatency

        targetCondition:

          type: string

          enum:

            - Is_less_than

        targetValueRange:

          type: integer

    ULLatencyTarget:

      type: object

      properties:

        targetName:

          type: string

          enum:

            - UlLatency

        targetCondition:

          type: string

          enum:

            - Is_less_than

        targetValueRange:

          type: integer

    MaxNumberofUEsTarget:

      type: object

      properties:

        targetAttribute:

          type: string

          enum:

            - maxNumberofUEs

        targetCondition:

          type: string

          enum:

            - Is_less _than

        targetValueRange:

          type: integer

    ActivityFactorTarget:

      type: object

      properties:

        targetAttribute:

          type: string

          enum:

            - activityFactor

        targetCondition:

          type: string

          enum:

            - Is_equal _than

        targetValueRange:

          type: integer

    UESpeedTarget:

      type: object

      properties:

        targetAttribute:

          type: string

          enum:

            - uESpeed

        targetCondition:

          type: string

          enum:

            - Is_less _than

        targetValueRange:

          type: integer



   #-------Definition of the concrete ExpectationTarget  dataType----------#  

   

   #-------Definition of the concrete ObjectTarget dataType----------------#
@@ -366,7 +521,114 @@ components: 
              - UTRAN

              - EUTRAN

              - NR

    EdgeIdenfiticationIdContext:

      type: object

      properties:

        contextAttribute:

          type: string

          enum:

            - edgeIdentificationId

        contextCondition:

          type: string

          enum:

            - Is_equal_than

        contextValueRange:

          type: array

          items:

            type: string

    EdgeIdenfiticationLocContext:

      type: object

      properties:

        contextAttribute:

          type: string

          enum:

            - edgeIdentificationTarget

        contextCondition:

          type: string

          enum:

            - Is_equal_than

        contextValueRange:

          type: array

          items:

            type: string

    CoverageAreaTAContext:

      type: object

      properties:

        contextAttribute:

          type: string

          enum:

            - coverageAreaTA

        contextCondition:

          type: string

          enum:

            - Is_within_the_range

        contextValueRange:

          type: array

          items:

            $ref: "#/components/schemas/CoverageAreaTAList"

    CoverageAreaTAList:

          type: integer



   #-------Definition of the concrete ObjectTarget dataType----------------#

   #-------Definition of the concrete ExpectionContext dataType----------------#

    ServiceStartTimeContext:

      type: object

      properties:

        contextAttribute:

          type: string

          enum:

            - ServiceStartTime

        contextCondition:

          type: string

          enum:

            - Is_equal_than

        contextValueRange:

          type: string

    ServiceEndTimeContext:

      type: object

      properties:

        contextAttribute:

          type: string

          enum:

            - ServiceEndTime

        contextCondition:

          type: string

          enum:

            - Is_equal_than

        contextValueRange:

          type: string

    UEMobilityLevelContext:

      type: object

      properties:

        contextAttribute:

          type: string

          enum:

            - UEMobilityLevel

        contextCondition:

          type: string

          enum:

            - Is_within_the_range

        contextValueRange:

          type: array

          items:

            $ref: "sliceNrm.yaml#/components/schemas/MobilityLevel"

    ResourceSharingLevelContext:

      type: object

      properties:

        contextAttribute:

          type: string

          enum:

            - ResourceSharingLevel

        contextCondition:

          type: string

          enum:

            - Is_within_the_range

        contextValueRange:

          type: array

          items:

            $ref: "sliceNrm.yaml#/components/schemas/SharingLevel"

   #-------Definition of the concrete ExpectionContext dataType----------------#



   

   #------Definition of JSON arrays for name-contained IOCs ---------------#
@@ -374,7 +636,7 @@ components: 
      type: array

      items:

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

   #------Definition of JSON arrays for name-contained IOCs --------------#

   #------Definition of JSON arrays for name-contained IOCs ---------------#

   

   #----- Definitions in TS 28.312 for TS 28.532 --------------------------#

    resources-intentNrm: