Commit 3b5500fe authored by sunse's avatar sunse
Browse files

Merge branch... 

Merge branch 'TS28.312_Rel-17_CR0006_Correction_to_Stage_3_and_Stage_2_definitions_for_Intent_Driven_Management' into 'Integration_Rel17_SA5_146_YAML'

Ts28.312 rel 17 cr0006 correction to stage 3 and stage 2 definitions for intent driven management

See merge request !460
parents df7cd801 dba4311c

OpenAPI/TS28312_IntentNrm.yaml

+27 −2
Original line number Diff line number Diff line
@@ -12,6 +12,24 @@ externalDocs: 
paths: {}

components:

  schemas:

       

   #-------Definition of concrete IOCs ----------#  



    SubNetwork-Single:

      allOf:

      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'

      - type: object

        properties:

          attributes:

            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'

      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO'

      - type: object

        properties:

          SubNetwork:

            $ref: '#/components/schemas/SubNetwork-Multiple'

          Intent:

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



    Intent-Single:

      allOf:

      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -33,6 +51,7 @@ components: 
              $ref: "#/components/schemas/IntentContext"

          intentFulfilmentInfo:

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

   #-------Definition of concrete IOCs ----------#  



   #-------Definition of the IntentExpectation dataType ----------#    

    IntentExpectation:
@@ -138,7 +157,7 @@ components: 
        objectType:

          type: string

          enum:

            - RAN_SubNetwrok  #value for Radio Network Expectation--#

            - RAN_SubNetwork  #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:
@@ -155,7 +174,7 @@ components: 
        objectType:

          type: string

          enum:

            - RAN_SubNetwrok  #value for Radio Network Expectation--#

            - RAN_SubNetwork  #value for Radio Network Expectation--#

        objectInstance:

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

        objectContexts:
@@ -805,6 +824,11 @@ components: 
   

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



    SubNetwork-Multiple:

      type: array

      items:

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

                                

    Intent-Multiple:

      type: array

      items:
@@ -814,5 +838,6 @@ components: 
   #----- Definitions in TS 28.312 for TS 28.532 --------------------------#

    resources-intentNrm:

      oneOf:

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

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

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