merge branch '5.2.1-dev' into 'Release-5'

Bertrand Souvillerequested to merge
5.2.1-dev into Release-5

Merge request reports

src/SOL002/APIVersion/APIVersion.yaml

+2 −2
Changes for src/SOL002/APIVersion/APIVersion.yaml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ info: 
  version: 1.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1



externalDocs:

  description: ETSI GS NFV-SOL 002 V5.1.1

  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf

  description: ETSI GS NFV-SOL 002 V5.2.1

  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf



paths:

  /vnfconfig/api_versions:

src/SOL002/General_Definitions/SOL002_def.yaml

+25 −6
Changes for src/SOL002/General_Definitions/SOL002_def.yaml: 25 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -198,8 +198,6 @@ definitions: 
    required:

      - resourceTemplateId

    oneOf:

      - required:

          - resourceTemplateId

      - required:

          - requestedCpuResources

      - required:
@@ -681,6 +679,7 @@ definitions: 
    type: object

    required:

      - cpdId

      - cpConfig

    properties:

      cpdId:

        description: >
@@ -694,6 +693,7 @@ definitions: 
          and is managed by the NFVO.

          The entries shall be applied by the VNFM according to the rules of JSON Merge Patch (see IETF RFC 7396).

          See notes 2, 3, 4, 5 and 6.

          In case of deleting an external CP, the list of instances to be deleted. 

        type: object

        additionalProperties:

          $ref: "#/definitions/VnfExtCpConfig"
@@ -750,6 +750,8 @@ definitions: 
          trunk. Reference to the "VnfExtCpConfig" entry that corresponds to the parent port of the trunk. Only present

          in "VnfExtCpConfig" structures that provide configuration information for a CP which represents a sub-port in

          a trunk, and if parent ports are supported.

          In case of deletion of an external CP, the identifier of the external CP instance to delete. 

          Shall be present if this instance has already been created.

        $ref: "#/definitions/IdentifierInVnf"

      

      linkPortId:
@@ -769,8 +771,8 @@ definitions: 


      cpProtocolData:

        description: >

          Parameters for configuring the network protocols on the

          link port that connects the CP to a VL. See notes 1 and 2.

          Parameters for configuring the network protocols on the link port that connects the CP to a VL and the domain 

          names for the external CP. See notes 1 and 2.

        type: array

        items:

          $ref: "#/definitions/CpProtocolData"
@@ -826,6 +828,15 @@ definitions: 
          instance exposes a virtual CP and shall not be

          present otherwise.

        $ref: "#/definitions/VirtualCpAddressData"

      fullyQualifiedDomainNames:

        description: >

          Specifies the fully qualified domain names (FQDN) to apply to the CP.

        type: string

      relativeDomainNames:

        description: >

          Specifies values of relative domain names to be considered when setting 

          the fully qualified domain names.

        type: string



  IpOverEthernetAddressData:

    description: >
@@ -1013,11 +1024,12 @@ definitions: 


      * NOTE 3: An example of the network attachment definition resource when the container infrastructure service

                management is a Kubernetes® instance is a network attachment definition (NAD).

      

      * NOTE 4: Either "extCps" or “extCpsDeletion" shall be present, but not both.

    type: object

    required:

      - id

      - resourceId

      - extCps

    properties:

      id:

        description: >
@@ -1047,7 +1059,7 @@ definitions: 
        description: >

          External CPs of the VNF to be connected to this external VL. Entries in the list of external

          CP data that are unchanged need not be supplied if the ExtVirtualLinkData structure is part

          of a request or response that modifies the external connectivity.

          of a request or response that modifies the external connectivity.See note 4.

        type: array

        items:

          $ref: "#/definitions/VnfExtCpData"
@@ -1072,6 +1084,13 @@ definitions: 
        type: array

        items:

          $ref: "#/definitions/NetAttDefResourceData"

      extCpsDeletion:

        description: >

          External CPs of the VNF to be disconnected from this 

          external VL and to be deleted. See note 4.

        type: array

        items:

          $ref: "#/definitions/VnfExtCpData"



  ScaleInfo:

    description: >

src/SOL002/VNFConfiguration/VNFConfiguration.yaml

+2 −2
Changes for src/SOL002/VNFConfiguration/VNFConfiguration.yaml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ info: 
  version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1



externalDocs:

  description: ETSI GS NFV-SOL 002 V5.1.1

  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf

  description: ETSI GS NFV-SOL 002 V5.2.1

  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf



servers:

  - url: http://127.0.0.1/vnfconfig/v1

src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml

+1 −1
Changes for src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ definitions: 
        description: >

          The URI of the endpoint to send the notification to.

        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Uri"

      pmJobConnection:

      fmConnection:

        description: >

          An access information and interface information to monitor the FM of VNF instance by the VNFM. 

          This can include for instance certain interface endpoint URI together with necessary credentials to access it.

src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml

+2 −2
Changes for src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ info: 
  version: 1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1



externalDocs:

  description: ETSI GS NFV-SOL 002 V5.1.1

  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf

  description: ETSI GS NFV-SOL 002 V5.2.1

  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf



servers:

  - url: http://127.0.0.1/vnffm/v1