Commit 51a662ed authored by ruiyue's avatar ruiyue
Browse files

Merge branch... 

Merge branch 'Rel_19_CR_TS_28.623_Address_the_stage2_and_stage3_misalignment_issues_for_vnfParametersList_and_peeParametersList' into 'Integration_Rel19_SA5_160_YAML'

Rel 19 cr0521 ts 28.623 address the stage2 and stage3 misalignment issues for vnf parameters list and pee parameters list

See merge request !1653
parents 7652c9aa b0659e16

OpenAPI/TS28623_GenericNrm.yaml

+11 −7
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ components: 
#-------- Definition of types-----------------------------------------------------





    VnfParameter:

    VnfParameters:

      description: ->

        This <<dataType>> represents the parameter set of the VNF instance(s) corresponding to an NE.

      type: object

      properties:

        vnfInstanceId:
@@ -27,13 +29,14 @@ components: 
          type: string

        autoScalable:

          type: boolean

    PeeParameter:

          default: FALSE

    PeeParameters:

      description: ->

        This <<dataType>> represents the parameter list for the control and monitoring of power, energy and environmental parameters.

      type: object

      properties:

        siteIdentification:

          type: string

        siteDescription:

          type: string

        siteLatitude:

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

        siteLongitude:
@@ -41,13 +44,14 @@ components: 
        siteAltitude:

          type: number

          format: float

        siteDescription:

          type: string  

        equipmentType:

          type: string

        environmentType:

          type: string

        powerInterface:

          type: string



    TransportProtocol:

      anyOf:

        - type: string
@@ -414,12 +418,12 @@ components: 
          type: array

          uniqueItems: true

          items:

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

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

        peeParametersList:

          type: array

          uniqueItems: true

          items:

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

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

        priorityLabel:

          type: integer

        supportedPerfMetricGroups: