Commit 64b3fad3 authored by ruiyue's avatar ruiyue
Browse files

Code Moderator address the implementation conflict issue

Merge branch 'Integration_Rel18_SA5_152_YAML' into 'TS28.312_Rel18_CR_0177_add_attributes_of_intent_preemption'

# Conflicts:
#   OpenAPI/TS28312_IntentNrm.yaml
parents aac7a6e3 119809e8
Loading
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -51,6 +51,10 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f
([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28105_AiMlNrm.yaml))
([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28105_AiMlNrm.yaml))

* RANSC NRM (TS 28.105)
([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28317_RanScNrm.yaml))
([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28317_RanScNrm.yaml))

## Management Services (MnS)

* Provisioning MnS (TS 28.532)
+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ components:
                      type: array
                      items:
                        type: string
                    confidenceIndication:
                    modelConfidenceIndication:
                      type: integer
                    modelPerformanceTraining:
                      type: array
+134 −17
Original line number Diff line number Diff line
@@ -135,11 +135,17 @@ components:
            oneOf:
              - $ref: "#/components/schemas/MaxNumberofPDUsessionsTarget"
              - $ref: "#/components/schemas/MaxNumberofRegisteredsubscribersTarget"
              - $ref: "#/components/schemas/IncomingDataTarget"
              - $ref: "#/components/schemas/OutgoingDataTarget"
              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget"
        expectationContexts:
          type: array
          items:
            $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext"
            type: object
            oneOf:
              - $ref: '#/components/schemas/StartTimeContext'
              - $ref: '#/components/schemas/ResourceSharingLevelContext'
              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext"
        expectationfulfilmentInfo:
            $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" 
      required:
@@ -166,7 +172,8 @@ components:
              - $ref: '#/components/schemas/CoverageAreaPolygonContext'
              - $ref: '#/components/schemas/CoverageTACContext'
              - $ref: '#/components/schemas/PLMNContext'
              - $ref: '#/components/schemas/NRFqBandContext'
              - $ref: '#/components/schemas/DlFrequencyContext'
              - $ref: '#/components/schemas/UlFrequencyContext'              
              - $ref: '#/components/schemas/RATContext'
              - $ref: "#/components/schemas/UEGroupContext"
              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext'                                
@@ -229,7 +236,9 @@ components:
              - $ref: "#/components/schemas/NfInstanceLocationContext"
              - $ref: "#/components/schemas/PLMNContext"
              - $ref: "#/components/schemas/TaiContext"
              - $ref: "#/components/schemas/ObjectContext"            
              - $ref: "#/components/schemas/ServingScopeContext"    
              - $ref: "#/components/schemas/DnnContext"
              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext"        
   #-------Definition of the ExpectationObject dataType ----------#    


@@ -656,6 +665,23 @@ components:
            - IS_LESS_THAN
        targetValueRange:
          type: integer
        targetContexts:
          $ref: '#/components/schemas/5GSessionContext'
    5GSessionContext:
      description: >-
        This data type is the "TargetContext" data type with specialisations for 5GSessionContext      
      type: object
      properties:
        contextAttribute:
          type: string
          enum:
            - 5GSession
        contextCondition:
          type: string
          enum:
            - IS_less_THAN
        contextValueRange:
          type: integer
    MaxNumberofRegisteredsubscribersTarget:
      description: >-
        This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofRegisteredsubscribersTarget     
@@ -671,6 +697,36 @@ components:
            - IS_LESS_THAN
        targetValueRange:
          type: integer
    IncomingDataTarget:
      description: >-
        This data type is the "ExpectationTarget" data type with specialisations for IncomingDataTarget     
      type: object
      properties:
        targetName:
          type: string
          enum:
            - IncomingData
        targetCondition:
          type: string
          enum:
            - IS_LESS_THAN
        targetValueRange:
          type: integer
    OutgoingDataTarget:
      description: >-
        This data type is the "ExpectationTarget" data type with specialisations for OutgoingDataTarget     
      type: object
      properties:
        targetName:
          type: string
          enum:
            - OutgoingData
        targetCondition:
          type: string
          enum:
            - IS_LESS_THAN
        targetValueRange:
          type: integer

   #-------Definition of the concrete ExpectationTarget  dataType----------#  
   
@@ -737,15 +793,17 @@ components:
          type: array
          items:
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
    NRFqBandContext:
    DlFrequencyContext:
      description: >-
        This data type is the "ObjectContext" data type with specialisations for NRFqBandContext       
        This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext".
        It describes the downlink frequency information (RF reference frequencies and/ or the 
        frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied.       
      type: object
      properties:
        contextAttribute:
          type: string
          enum:
            - NRFqBand
            - DlFrequency
        contextCondition:
          type: string
          enum:
@@ -753,7 +811,26 @@ components:
        contextValueRange:
          type: array
          items:
            $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency'
    UlFrequencyContext:
      description: >-
        This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext".
        It describes the uplink frequency information (RF reference frequencies and/ or the frequency 
        operating band) supported by the RAN SubNetwork that the intent expectation is applied.       
      type: object
      properties:
        contextAttribute:
          type: string
          enum:
            - UlFrequency
        contextCondition:
          type: string
          enum:
            - IS_ALL_OF
        contextValueRange:
          type: array
          items:
            $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency'            
    RATContext:
      description: >-
        This data type is the "ObjectContext" data type with specialisations for RATContext           
@@ -791,14 +868,7 @@ components:
        contextValueRange:
          type: array
          items:
            $ref: "#/components/schemas/UEGroup"            
    UEGroup:
      type: object
      properties:
        fiveQI:
          type: integer
        sNssai:
          $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'  
            $ref: "TS28312_IntentNrm.yaml#/components/schemas/UEGroup"              
    EdgeIdenfiticationIdContext:
      description: >-
        This data type is the "ObjectContext" data type with specialisations for EdgeIdentificationIdContext      
@@ -897,7 +967,40 @@ components:
          type: array
          items:
            $ref: "TS28623_GenericNrm.yaml#/components/schemas/Tai"

    ServingScopeContext:          
      description: >-
        This data type is the "ObjectContext" data type with specialisations for ServingScopeContext   
      type: object
      properties:
        contextAttribute:
          type: string
          enum:
            - ServingScope
        contextCondition:
          type: string
          enum:
            - IS_ALL_OF
        contextValueRange:
          type: array
          items:
            type: string
    DnnContext:          
      description: >-
        This data type is the "ObjectContext" data type with specialisations for DnnContext   
      type: object
      properties:
        contextAttribute:
          type: string
          enum:
            - Dnn
        contextCondition:
          type: string
          enum:
            - IS_ALL_OF
        contextValueRange:
          type: array
          items:
            type: string
   #-------Definition of the scenario specific  ObjectTarget dataType----------------#
   
   #-------Definition of the concrete ExpectationContext dataType----------------#
@@ -993,5 +1096,19 @@ components:
            - IS_EQUAL_TO
        contextValueRange:
          $ref: "TS28541_NrNrm.yaml#/components/schemas/Sst"

    StartTimeContext:
      description: >-
        This data type is the "ExpectationContext" data type with specialisations for StartTimeContext       
      type: object
      properties:
        contextAttribute:
          type: string
          enum:
            - StartTime
        contextCondition:
          type: string
          enum:
            - IS_EQUAL_TO
        contextValueRange:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
   #-------Definition of the concrete ExpectionContext dataType----------------#
+98 −24
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ components:
            $ref: '#/components/schemas/IntentHandlingFunction-Multiple'

    Intent-Single:
      description: >-
        This IOC represents the properties of an Intent driven management information between MnS consumer and MnS producer.  
      allOf:
      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'    
      - type: object
@@ -53,13 +55,22 @@ components:
            type: array
            items:
              $ref: '#/components/schemas/IntentContext'
            description: >-
              It describes the list of IntentContext(s) which represents the constraints and conditions that should apply 
              for the entire intent even if there may be specific contexts defined for specific parts of the intent  
          intentAdminState:
            type: string
            enum:
              - ACTIVATED
              - DEACTIVATED
            description: >-
              It describes the intent administrative state. 
              This attribute is used when MnS consumer-suspension mechanism is supported
          intentPriority:
            type: integer
            minimum: 1
            maximum: 100
            description: It expresses the priority of the stated intent within a MnS consumer.   
          intentPreemptionCapability:
            type: string
            enum:
@@ -67,9 +78,13 @@ components:
              - FALSE
          observationPeriod:
            type: integer
            description: >- 
              It represents the observation period of the fulfilmentInfo for corresponding 
              ExpectationTargets, IntentExpectations and Intent.
          intentReportReference:
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
    IntentReport-Single:
      description: It represents intent report information from MnS producer to MnS consumer. 
      allOf:
      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'    
      - type: object
@@ -82,11 +97,14 @@ components:
              $ref: '#/components/schemas/IntentConflictReport'
          intentFeasibilityCheckReport:
            $ref: '#/components/schemas/IntentFeasibilityCheckReport'              
          lastUpdated:
          lastUpdatedTime:
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
          intentReference:
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
    IntentHandlingFunction-Single:
      description: >- 
        It represents the intent handling capabilities can be supported by a specific intent 
        handling function of MnS producer.
      allOf:
      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
      - type: object
@@ -106,10 +124,12 @@ components:
    IntentExpectation:
      description: >-
        This data type is the "IntentExpectation" data type without specialisations
        It represents MnS consumer's requirements, goals and contexts given to a 3GPP system 
      type: object
      properties:
        expectationId:
          type: string
          description: A unique identifier of the intentExpectation within the intent.
        expectationVerb:
           $ref: "#/components/schemas/ExpectationVerb"
        expectationObject:
@@ -131,6 +151,7 @@ components:
   #-------Definition of the generic ExpectationObject dataType ----------#    
    ExpectationObject:
      description: >-
        It represents the Object to which the IntentExpectation should apply.
        This data type is the "ExpectationObject" data type without specialisations
      type: object
      properties:
@@ -148,6 +169,9 @@ components:
          type: array
          items:
            $ref: '#/components/schemas/ObjectContext'
          description: >-
           It describes the list of ObjectContext(s) which represents the constraints and conditions to be 
           used as filter information to identify the object(s) to which a given intentExpectation should apply.

   #-------Definition of the generic ExpectationObject dataType ----------#    

@@ -171,12 +195,13 @@ components:
        - ALL_OF
        - ONE_OF
        - ANY_OF
    FulfilStatus:
    FulfilmentStatus:
      type: string
      readOnly: true      
      enum:
          - FULFILLED
          - NOT_FULFILLED
      description: It describes the current status of the intent fulfilment result.    
    NotFulfilledState:
      type: string
      readOnly: true      
@@ -187,25 +212,48 @@ components:
          - SUSPENDED
          - TERMINATED
          - FULFILMENTFAILED
      description: It describes the current progress of or the reason for not achieving fulfilment 
                   for the intent, intentExpectation or expectationTarget.
                   An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo    
    FulfilmentInfo:
      description: >-
        This dataType represents the properties of a specific fulfilment information for an aspect of 
        the intent (i.e. either an expectation, a target or the whole intent).     
      type: object
      properties:
        fulfilStatus:
          $ref: '#/components/schemas/FulfilStatus'
        fulfilmentStatus:
          $ref: '#/components/schemas/FulfilmentStatus'
        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: array
          items: 
            type: string
          readOnly: true
          description: An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo          
    ExpectationVerb:
      type: string
      enum:
          - DELIVER
          - ENSURE
      description: It describes the characteristic of the intentExpectation and is the property that describes the types of intentExpectations.    
    Frequency:
      description: >-
        It desribes the RF reference frequency (i.e. Absolute Radio Frequency Channel Number) 
        and/or the frequency operating band used for a given direction (UL or DL) in FDD or 
        for both UL and DL directions in TDD.      
      type: object 
      properties:
        arfcn:
          type: integer
          description: >- 
            This attribute shall be supported, when the frequency information represent RF reference frequency.
            The allowed values for NR see TS 38.104 subclause 5.4.2.1; The allowed values for EUTRAN see TS 36.104 [X] subclause 5.7.3; 
        freqband:
          type: string
          description: >-
            This attribute shall be supported, when the frequency information represent frequency operating band. 
            The allowed values for NR see TS 38.104 subclause 5.4.2.3; The allowed value for EUTRAN see TS 36.104 subclause 5.7.3       
    ValueRangeType: 
      oneOf:
        - type: number
@@ -217,6 +265,21 @@ components:
        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate'
        - $ref: '#/components/schemas/UEGroup'
        - $ref: '#/components/schemas/Frequency'                  
    UEGroup:
      description: >-
        It describes the UE Group, which is 
        represented by specific 5QI, specific S-NSSAI, or a specific combination 
        of S-NSSAI and 5QI
      type: object
      properties:
        fiveQI:
          type: integer
          minimum: 0
          maximum: 255  
        sNssai: 
          $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'                      
   #-------Definition of the generic dataType --------------#    

   #-------Definition of the generic IntentContext dataType --------------#    
@@ -240,6 +303,7 @@ components:
   #-------Definition of the generic ExpectationTarget dataType----------#     
    ExpectationTarget:
      description: >-
        This data type represents the target of the IntentExpectation that are required to be achieved.
        This data type is the "ExpectationTarget" data type without specialisations
      type: object
      properties:
@@ -259,6 +323,7 @@ components:
          type: array
          items:
            $ref: '#/components/schemas/TargetContext'
          description: It describes the list of constraints and conditions that should apply for a specific expectationTarget.    
    TargetContext:
      description: >-
        This data type is the "TargetContext" data type without specialisations
@@ -314,7 +379,8 @@ components:
   #-------Definition of the generic IntentFulfilmentReport dataType----------------#
    IntentFulfilmentReport:
      description: >-
        This data type is the "IntentFulfilmentReport" data type without specialisations       
        It includes the intentFulfilmentInfo and expectationFulfilmetResult. 
        This attribute shall be supported when intent fulfilment information is supported by IntentReport        
      type: object
      properties:
        intentFulfilmentInfo:
@@ -328,7 +394,7 @@ components:
   #-------Definition of the generic ExpectationFulfilmentResult dataType----------------#
    ExpectationFulfilmentResult:
      description: >-
        This data type is the "ExpectationFulfilmentResult" data type without specialisations       
        It includes the expectationFulfilmentInfo and targetFulfilmetResults for each IntentExpectation.   
      type: object
      properties:
        expectaitonId:
@@ -344,7 +410,7 @@ components:
   #-------Definition of the generic TargetFulfilmentResult dataType----------------#
    TargetFulfilmentResult:
      description: >-
        This data type is the "TargetFulfilmentResult" data type without specialisations       
        This data type includes targetFulfilmentInfo and targetAchievedValue for each ExpectationTarget.       
      type: object
      properties:
        targetName:
@@ -358,7 +424,8 @@ components:
   #-------Definition of the generic IntentConflictReport dataType----------------#
    IntentConflictReport:
      description: >-
        This data type is the "IntentConflictReport" data type without specialisations       
        It represents the conflict information for the detected conflict
        This attribute shall be supported when intent conflict information is supported by IntentReport         
      type: object
      properties:
        conflictId:
@@ -386,7 +453,8 @@ components:
   #-------Definition of the generic IntentFeasibilityCheckReport dataType----------------#
    IntentFeasibilityCheckReport:
      description: >-
        This data type is the "IntentFeasibilityCheckReport" data type without specialisations       
        It represents the intent feasibility check information
        This attribute shall be supported when intent feasibility check information information is supported by IntentReport       
      type: object
      properties:
        feasibilityCheckResult:
@@ -395,13 +463,15 @@ components:
              - FEASIBLE
              - INFEASIBLE
        infeasibilityReason:
          description: ->
            An attribute which is used when feasibilityCheckResult is INFEASIBLE
          type: string
          description: An attribute which is used when feasibilityCheckResult is INFEASIBLE          
   #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------#

   #-------Definition of the generic IntentHandlingCapability dataType----------------#
    IntentHandlingCapability:   
      description: >-
        It represents expectation object information and expectation target information 
        which can be supported by a specific intent handling function of MnS producer.
      type: object
      properties:
        intentHandlingCapabilityId:
@@ -412,8 +482,12 @@ components:
            - RAN_SUBNETWORK
            - EDGE_SERVICE_SUPPORT
            - 5GC_SUBNETWORK 
        supportedExpectationTargetType:
          description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer.            
        supportedExpectationTargetNames:
          type: array
          items:
            type: string
          description: It describes the supported expectation targets for the supported expectation object type.
   #-------Definition of the concrete IntentHandlingCapability dataType----------------#

   #------Definition of JSON arrays for name-contained IOCs ---------------#
+176 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading