Commit a0c161da authored by ruiyue's avatar ruiyue
Browse files

Merge branch... 

Merge branch 'TS28.312_Rel17_CR0009_Update_Enum_value_to_use_upper_case_characters_to_align_with_TS_32.156' into 'Integration_Rel17_SA5_146_YAML'

Ts28.312 rel17 cr0009 update enum value to use upper case characters to align with ts 32.156

See merge request sa5/MnS!453
parents d6c35ca7 236941d0

OpenAPI/TS28312_IntentNrm.yaml

+33 −32
Original line number Diff line number Diff line
@@ -195,10 +195,11 @@ components: 
    Condition:

      type: string

      enum:

        - Is_equal_to

        - Is_less_than

        - Is_greater_than

        - Is_within_the_range

        - IS_EQUAL_TO

        - IS_LESS_THAN

        - IS_GREATER_THAN

        - IS_WITHIN_RANGE

        - IS_OUTSIDE_RANGE

    FulfilStatus:

      type: string

      enum:
@@ -288,7 +289,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_less_than

            - IS_LESS_THAN

        targetValueRange:

          type: integer

          minimum: 0
@@ -309,7 +310,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_less_than

            - IS_LESS_THAN

        contextValueRange:

          type: number

    LowSINRRatioTarget:
@@ -324,7 +325,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_less_than

            - IS_LESS_THAN

        targetValueRange:

          type: integer

          minimum: 0
@@ -345,7 +346,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_less_than

            - IS_LESS_THAN

        contextValueRange:

          type: integer

    AveULRANUEThptTarget:
@@ -360,7 +361,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_greater_than

            - IS_GREATER_THAN

        targetValueRange:

          type: integer

        targetFulfilmentInfo:
@@ -377,7 +378,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_greater_than

            - IS_GREATER_THAN

        targetValueRange:

          type: integer

        targetFulfilmentInfo:
@@ -394,7 +395,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_less_than

            - IS_LESS_THAN

        targetValueRange:

          type: integer

          minimum: 0
@@ -430,7 +431,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_less_than

            - IS_LESS_THAN

        targetValueRange:

          type: integer

          minimum: 0
@@ -451,7 +452,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_less_than

            - IS_LESS_THAN

        contextValueRange:

          type: number

    DLThptPerUETarget:
@@ -466,7 +467,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_greater_than

            - IS_GREATER_THAN

        targetValueRange:

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

    ULThptPerUETarget:
@@ -481,7 +482,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_greater_than

            - IS_GREATER_THAN

        targetValueRange:

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

    DLLatencyTarget:
@@ -496,7 +497,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_less_than

            - IS_LESS_THAN

        targetValueRange:

          type: integer

    ULLatencyTarget:
@@ -511,7 +512,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_less_than

            - IS_LESS_THAN

        targetValueRange:

          type: integer

    MaxNumberofUEsTarget:
@@ -526,7 +527,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_less _than

            - IS_LESS_THAN

        targetValueRange:

          type: integer

    ActivityFactorTarget:
@@ -541,7 +542,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_equal _than

            - IS_EQUAL_TO

        targetValueRange:

          type: integer

    UESpeedTarget:
@@ -556,7 +557,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_less _than

            - IS_LESS_THAN

        targetValueRange:

          type: integer

   #-------Definition of the concrete ExpectationTarget  dataType----------#
@@ -587,7 +588,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_within_the_range

            - IS_WITHIN_RANGE

        contextValueRange:

          type: array

          items:
@@ -606,7 +607,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_within_the_range

            - IS_WITHIN_RANGE

        contextValueRange:

          type: array

          items:
@@ -623,7 +624,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_within_the_range

            - IS_WITHIN_RANGE

        contextValueRange:

          type: array

          items:
@@ -640,7 +641,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_within_the_range

            - IS_WITHIN_RANGE

        contextValueRange:

          type: array

          items:
@@ -657,7 +658,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_within_the_range

            - IS_WITHIN_RANGE

        contextValueRange:

          type: array

          items:
@@ -678,7 +679,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_equal_than

            - IS_EQUAL_TO

        contextValueRange:

          type: array

          items:
@@ -695,7 +696,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_equal_than

            - IS_EQUAL_TO

        contextValueRange:

          type: array

          items:
@@ -712,7 +713,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_within_the_range

            - IS_WITHIN_RANGE

        contextValueRange:

          type: array

          items:
@@ -747,7 +748,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_equal_than

            - IS_EQUAL_TO

        contextValueRange:

          type: string

    ServiceEndTimeContext:
@@ -762,7 +763,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_equal_than

            - IS_EQUAL_TO

        contextValueRange:

          type: string

    UEMobilityLevelContext:
@@ -777,7 +778,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_within_the_range

            - IS_WITHIN_RANGE

        contextValueRange:

          type: array

          items:
@@ -794,7 +795,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_within_the_range

            - IS_WITHIN_RANGE

        contextValueRange:

          type: array

          items:

README.md

+5 −5
Original line number Diff line number Diff line
@@ -2,18 +2,18 @@ 


The Rel-16 branch represents the latest Rel-16 content approved and published after each TSG SA plenary. 



Rel17-draft branch represents the current working in progress release status.

Rel-17 branch represents the current working in progress release status.



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

All rights reserved.



Branch {+Rel17-draft+} validation status:

Branch {+Rel-17+} validation status:



[![pipeline status](https://forge.3gpp.org/rep/SA5/MnS/badges/Rel17-draft/pipeline.svg)](https://forge.3gpp.org/rep/SA5/MnS/commits/Rel17-draft)

[![pipeline status](https://forge.3gpp.org/rep/SA5/MnS/badges/Rel-17/pipeline.svg)](https://forge.3gpp.org/rep/SA5/MnS/commits/Rel-17)



## Data models validation



The YANG data models in the present projects are validated by an automated CI agent. Learn more at:



* [Jenkins job run for this project](https://forge.3gpp.org/jenkins/view/SA5/)

* [Validation scripts repository](https://forge.3gpp.org/rep/tools/3gpp-scripts)
 
* [Management And Orchestration APIs Wiki](https://forge.3gpp.org/rep/sa5/MnS/-/wikis/home)

* [Validation scripts repository](https://forge.3gpp.org/rep/tools/3gpp-scripts/sa5)