Commit ce5530cd authored by ruiyue's avatar ruiyue
Browse files

Merge branch 'Rel_19_CR_28_538_EAS_Bundle_Stage_2_and_Stage_3' into... 

Merge branch 'Rel_19_CR_28_538_EAS_Bundle_Stage_2_and_Stage_3' into 'Integration_Rel19_SA5_156_YAML'

Rel 19 cr0084 28.538 eas bundle stage 2 and stage 3

See merge request !1228
parents 089449ea bc12d678

OpenAPI/TS28538_EdgeNrm.yaml

+32 −6
Original line number Diff line number Diff line
@@ -158,8 +158,6 @@ components: 
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

        servedEESList:

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





#-------- Definition of types for name-containments ------

    SubNetwork-ncO-EdgeNrm:

      type: object
@@ -168,6 +166,8 @@ components: 
          $ref: '#/components/schemas/ECSFunction-Multiple'

        EdgeDataNetwork:

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

        EASBundle:

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



#-------- Definition of concrete IOCs --------------------------------------------
@@ -382,7 +382,30 @@ components: 
              $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

            edgeDataNetworkRef:

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



    EASBundle-Single:

      allOf:

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

        - type: object

          properties:

            bundleIdentifier:

              type: string

            bundledEASIdentifier:

              type: string

            bundleType:

              type: string

            mainEASIdentifier:

              type: string

            coordinatedEASDiscovery:

              type: boolean

            coordinatedACR:

              type: boolean

            eDNAffinity:

              type: string

              description: any of enumrated value

              enum:

                - STRONG

                - WEAK

                - PREFERRED



#-------- Definition of JSON arrays for name-contained IOCs ----------------------
@@ -418,8 +441,10 @@ components: 
      type: array

      items:

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



        

    EASBundle-Multiple:

      type: array

      items:

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

#--------------------------------- Definition ------------------------------------                          



    resources-edgeNrm:
@@ -434,3 +459,4 @@ components: 
        - $ref: '#/components/schemas/OperatorEdgeFederation-Single'

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

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

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