Update 2 files

   #-------Definition of the Scenario specific ExpectationTarget dataType----------#     

    WeakRSRPRatioTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for WeakRSRPRatioTarget

        This data type is the "ExpectationTarget" data type with specialisations for WeakRSRPRatioTarget. It describes

        the downlink weak coverage ratio target for the RAN SubNetwork that the intent expectation is applied. 

        The numerator is the number of the cells with downlink weak RSRP, and the denominator is the total number

        of cells of the RAN Subnetwork in the specified area.

      type: object

      properties:

        targetName:

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

    WeakRSRPContext:

      description: >-

        This data type is the "TargetContext" data type with specialisations for WeakRSRPContext

        This data type is the "TargetContext" data type with specialisations for WeakRSRPContext. It describes the threshold

        for downlink weak RSRP of the cells (see RSRP measurements in TS 28.552 [6]) of the RAN SubNetwork that the intent 

        expectation is applied.

      type: object

      properties:

        contextAttribute:

          type: number

    LowSINRRatioTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for LowSINRatioTarget

        This data type is the "ExpectationTarget" data type with specialisations for LowSINRatioTarget.It describes the low SINR 

        ratio target for the RAN SubNetwork that the intent expectation is applied. The numerator is the number of the cells with

        low SINR, and the denominator is the total number of cells of the RAN Subnetwork in the specified area.

      type: object

      properties:

        targetName:

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

    LowSINRContext:

      description: >-

        This data type is the "TargetContext" data type with specialisations for LowSINRContext

        This data type is the "TargetContext" data type with specialisations for LowSINRContext.It describes the threshold for 

        low SINR of the cells (see SINR measurements in TS 28.552 [6]) of the RAN SubNetwork that the intent expectation is applied.

      type: object

      properties:

        contextAttribute:

          type: integer

    AveULRANUEThptTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for AveULRANUEThptTarget

        This data type is the "ExpectationTarget" data type with specialisations for AveULRANUEThptTarget.It describes the average

        UL RAN UE throughput target for RAN SubNetwork (see UL RAN UE throughput for a sub-network in TS 28.554[11]) that the intent

        expectation is applied.

      type: object

      properties:

        targetName:

          type: integer

    AveDLRANUEThptTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget    

        This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget.It describes the average

        DL RAN UE throughput target for RAN SubNetwork (see DL RAN UE throughput for a sub-network in TS 28.554[11]) that the intent

        expectation is applied.    

      type: object

      properties:

        targetName:

          type: integer

    LowULRANUEThptRatioTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget        

        This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget.It describes the low

        UL RAN UE throughput ratio target for the RAN SubNetwork that the intent expectation is applied. The numerator is the number

        of the cells with low UL RAN UE throughput, and the denominator is the total number of cells of the RAN Subnetwork in the 

        specified area.        

      type: object

      properties:

        targetName:

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

    LowULRANUEThptContext:

      description: >-

        This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext    

        This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext.It describes the threshold 

        for the low UL RAN UE throughput cells (see average UL RAN UE throughput in gNB and distribution of UL UE throughput in gNB

        in TS 28.552[6]) of the RAN SubNetwork that the intent expectation is applied.    

      type: object

      properties:

        contextAttribute:

          type: number

    LowDLRANUEThptRatioTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for LowDLRANUEThptRatioTarget         

        This data type is the "ExpectationTarget" data type with specialisations for LowDLRANUEThptRatioTarget. It describes

        the low DL RAN UE throughput ratio target for the RAN SubNetwork that the intent expectation is applied.The numerator

        is the number of the cells with low DL RAN UE throughput, and the denominator is the total number of cells of the 

        RAN Subnetwork in the specified area.        

      type: object

      properties:

        targetName:

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

    LowDLRANUEThptContext:

      description: >-

        This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext      

        This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext.It describes the threshold

        for the low DL RAN UE throughput cells ((see average DL RAN UE throughput in gNB and distribution of DL UE throughput in gNB

        in TS 28.552[6]) ) of the RAN SubNetwork that the intent expectation is applied.      

      type: object

      properties:

        contextAttribute:

          type: number

    HighULPrbLoadRatioTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for HighULPrbLoadRatioTarget         

        This data type is the "ExpectationTarget" data type with specialisations for HighULPrbLoadRatioTarget. It describes the high UL

        PRB load ratio target (as percentage) for the RAN SubNetwork that the intent expectation is applied. The numerator is the number

        of the cells with high UL PRB load, and the denominator is the total number of cells of the RAN Subnetwork in the specified area.         

      type: object

      properties:

        targetName:

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

    HighULPrbLoadContext:

      description: >-

        This data type is the "TargetContext" data type with specialisations for HighULPrbLoadContext      

        This data type is the "TargetContext" data type with specialisations for HighULPrbLoadContext.It describes the threshold for high

        uplink PRB load (i.e. UL Total PRB Usage in TS 28.552 [12] to represent the percentage of UL PRBs used) of the cells of the RAN

        SubNetwork in the specified area that the intent expectation is applied.      

      type: object

      properties:

        contextAttribute:

          maximum: 100

    HighDLPrbLoadRatioTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for HighDLPrbLoadRatioTarget         

        This data type is the "ExpectationTarget" data type with specialisations for HighDLPrbLoadRatioTarget.It describes the high DL PRB

        load ratio target (as percentage) for the RAN SubNetwork that the intent expectation is applied. The numerator is the number of the

        cells with high DL PRB load, and the denominator is the total number of cells of the RAN Subnetwork in the specified area.         

      type: object

      properties:

        targetName:

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

    HighDLPrbLoadContext:

      description: >-

        This data type is the "TargetContext" data type with specialisations for HighDLPrbLoadContext      

        This data type is the "TargetContext" data type with specialisations for HighDLPrbLoadContext.It describes the threshold for high downlink

        PRB load (i.e. DL Total PRB Usage in TS 28.552 [12] to represent the percentage of DL PRBs used) of the cells of the RAN SubNetwork in the

        specified area that the intent expectation is applied.      

      type: object

      properties:

        contextAttribute:

          maximum: 100

    AveULPrbLoadTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for AveULPrbLoadTarget    

        This data type is the "ExpectationTarget" data type with specialisations for AveULPrbLoadTarget.It describes the average uplink PRB load target

        (i.e. UL Total PRB Usage in TS 28.552 [12] to represent the percentage of UL PRBs used) of the cells of the RAN SubNetwork that the intent

        expectation is applied.    

      type: object

      properties:

        targetName:

          maximum: 100

    AveDLPrbLoadTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for AveDLPrbLoadTarget    

        This data type is the "ExpectationTarget" data type with specialisations for AveDLPrbLoadTarget.It describes the average dowlink PRB load

        (i.e. DL Total PRB Usage in TS 28.552 [12] to represent the percentage of DL PRBs used) target for RAN SubNetwork that the intent expectation

        is applied.    

      type: object

      properties:

        targetName:

          maximum: 100

    RANEnergyConsumptionTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for RANEnergyConsumptionTarget      

        This data type is the "ExpectationTarget" data type with specialisations for RANEnergyConsumptionTarget.It describes the RAN energy consumption

        target for RAN SubNetwork that the intent expectation is applied. The definition for RAN energy consumption see ECNG-RAN in clause 6.7.3.4.1 in

        TS 28.554 [11].      

      type: object

      properties:

        targetName:

          type: integer

    RANEnergyEfficiencyTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for RANEnergyEfficiencyTarget       

        This data type is the "ExpectationTarget" data type with specialisations for RANEnergyEfficiencyTarget.It describes the RAN energy efficiency target

        for RAN SubNetwork that the intent expectation is applied. The unit of this target is bit/J. The definition for RAN energy efficiency target for RAN

        SubNetwork see EEMN,DV in clause 6.7.1.1 in TS 28.554 [11].       

      type: object

      properties:

        targetName:

          type: integer

    DLThptPerUETarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget       

        This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget. It describes the DL throughput target by the per UE for the 

        Edge service supporting or Radio servicde that the intent expectation is applied. For details see dlThptPerUE defined in clause 6.3.1 of TS 28.541 [5].     

      type: object

      properties:

        targetName:

          enum:

            - IS_GREATER_THAN

        targetValueRange:

          $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt'

          type: integer

    ULThptPerUETarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget       

        This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget.It describes the UL throughput target by the per UE for the Edge

        service supporting or Radio service that the intent expectation is applied. For details see ulThptPerUE defined in clause 6.3.1 of TS 28.541 [5].       

      type: object

      properties:

        targetName:

          enum:

            - IS_GREATER_THAN

        targetValueRange:

          $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt'

          type: integer

    DLLatencyTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget       

        This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget.It describes the DL latency target for the Edge service supporting or Radio service

        that the intent expectation is applied       

      type: object

      properties:

        targetName:

          type: integer

    ULLatencyTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for ULLatencyTarget     

        This data type is the "ExpectationTarget" data type with specialisations for ULLatencyTarget. It describes the UL latency target for the Edge service supporting or RadioService

        that the intent expectation is applied. For details see attribute ulLatency defined in clause 6.3.1 of TS 28.541 [5]     

      type: object

      properties:

        targetName:

          type: integer

    MaxNumberofUEsTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget     

        This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget.It describes the the number of UEs for Edge service supporting

        that the intent expectation is applied. For details see attribute maxNumberofUE defined in clause 6.3.1 of of TS 28.541 [5]     

      type: object

      properties:

        targetName:

          type: integer

    ActivityFactorTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for ActivityFactorTarget       

        This data type is the "ExpectationTarget" data type with specialisations for ActivityFactorTarget.It describes the percentage value of the amount of simultaneous

        active UEs to the total number of UEs where active means the UEs are exchanging data with the Edge service supporting that the intent expectation is applied.

        For details see activityFactor in clause 6.3.1 in TS 28.541 [5].       

      type: object

      properties:

        targetName:

          type: integer

    UESpeedTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget      

        This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget.It describes the speed (in km/hour) supported for Edge service supporting

        that the intent expectation is applied. For details see uESpeed in clause 6.3.1 in TS 28.541[5].

      type: object

      properties:

        targetName:

          type: integer

    MaxNumberofPDUsessionsTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofPDUsessionsTarget     

        This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofPDUsessionsTarget.It describes the maximum number of PDU sessions for 5GC

        SubNetwork supporting that the intent expectation is applied. For details, see maxNumberofPDUsessions in clause 5.3.1.2 in TS 28.552 [12].     

      type: object

      properties:

        targetName:

          $ref: '#/components/schemas/5GSessionContext'

    5GSessionContext:

      description: >-

        This data type is the "TargetContext" data type with specialisations for 5GSessionContext      

        This data type is the "TargetContext" data type with specialisations for 5GSessionContext.It describes the maximum supported 5G PDU session of the 5GC SubNetwork

        related to the intent expectation.      

      type: object

      properties:

        contextAttribute:

          type: integer

    MaxNumberofRegisteredsubscribersTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofRegisteredsubscribersTarget     

        This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofRegisteredsubscribersTarget.It describes the maximum number of Registered

        subscribers for 5GC SubNetwork supporting that the intent expectation is applied. For details, see maxNumberofRegisteredsubscribers in clause 5.6.2 in TS 28.552 [12].     

      type: object

      properties:

        targetName:

          type: integer

    IncomingDataTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for IncomingDataTarget     

        This data type is the "ExpectationTarget" data type with specialisations for IncomingDataTarget.It describes the maximum incoming data packets for 5GC SubNetwork

        related to the intent expectation. For details, see N6 incoming link usage measurement in clause 5.4.2.1 in TS 28.552 [12].     

      type: object

      properties:

        targetName:

          type: integer

    OutgoingDataTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for OutgoingDataTarget     

        This data type is the "ExpectationTarget" data type with specialisations for OutgoingDataTarget.It describes the maximum outgoing data packets for 5GC SubNetwork

        related to the intent expectation. For details, see N6 outgoing link usage measurement in clause 5.4.2.2 in TS 28.552 [12].     

      type: object

      properties:

        targetName:

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

    CoverageAreaPolygonContext:

      description: >-

        This data type is the "ObjectContext" data type with specialisations for CoverageAreaPolygonContext          

        This data type is the "ObjectContext" data type with specialisations for CoverageAreaPolygonContext.It describes the coverage areas for the RAN SubNetwork that the

        intent expectation is applied in the form of polygon.          

      type: object

      properties:

        contextAttribute:

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

    CoverageTACContext:

      description: >-

        This data type is the "ObjectContext" data type with specialisations for CoverageTACContext     

        This data type is the "ObjectContext" data type with specialisations for CoverageTACContext.It describes the coverage areas for the RAN SubNetwork that the intent

        expectation is applied in the form of TAC.     

      type: object

      properties:

        contextAttribute:

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

    DlFrequencyContext:

      description: >-

        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.       

        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:

            $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency'

    UlFrequencyContext:

      description: >-

        This data type is the "Context" data type with specialisations for Object context "ULFrequencyContext".

        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.       

        This data type is the "Context" data type with specialisations for Object context "ULFrequencyContext".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:

            $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency'            

    RATContext:

      description: >-

        This data type is the "ObjectContext" data type with specialisations for RATContext           

        This data type is the "ObjectContext" data type with specialisations for RATContext.It describes the RAT supported by the RAN SubNetwork that the intent expectation

        is applied.           

      type: object

      properties:

        contextAttribute:

    TargetAssuranceTimeContext:

      description: >-

        This data type is the "Expectation Context" data type with specialisations for TargetAssuranceTimeContext       

        This data type is the "Expectation Context" data type with specialisations for TargetAssuranceTimeContext.It describes the timeWindows

        (including startTime, endTime) when the targets in the Intent Expectation need to be assured.       

      type: object

      properties:

        contextAttribute:

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

    ServiceTypeContext:

      description: >-

        This data type is the "ExpectationContext" data type with specialisations for ServiceTypeContext       

        This data type is the "ExpectationContext" data type with specialisations for ServiceTypeContext.It describes

        the service type for the Radio Service that the intent expectation is applied. For details see sST in clause 6.4.1 in TS 28.541 [5]       

      type: object

      properties:

        contextAttribute:

            - RAN_SUBNETWORK  #value for Radio Network Expectation--#

            - EDGE_SERVICE_SUPPORT  #value for Edge Service Support Expectation--#

            - 5GC_SUBNETWORK  #value for 5GC Network Expectation--#

            - RadioService  #value for Radio Service Expectation--#            

            - Radio_Service  #value for Radio Service Expectation--#            

        objectInstance:

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

        objectContexts:

            - RAN_SUBNETWORK

            - EDGE_SERVICE_SUPPORT

            - 5GC_SUBNETWORK 

            - RadioService

            - Radio_Service

          description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer.            

        supportedExpectationTargetNames:

          type: array