Commit e89f0962 authored by piscione's avatar piscione
Browse files

Addressed other comments for SOL005.

parent 5ead96e1

src/SOL005/APIVersion/APIVersion.yaml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ info: 
  license:

    name: ETSI Forge copyright notice

    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt

  version: 1.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1

  version: 1.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1



externalDocs:

  description: ETSI GS NFV-SOL 005 V4.3.1

src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ info: 
  license:

    name: ETSI Forge copyright notice

    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt

  version: 1.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1

  version: 1.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1



externalDocs:

  description: ETSI GS NFV-SOL 005 V4.3.1

src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ info: 
  license:

    name: ETSI Forge copyright notice

    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt

  version: 2.2.1-impl:etsi.org:ETSI_NFV_OpenAPI:1

  version: 2.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1



externalDocs:

  description: ETSI GS NFV-SOL 005 V4.3.1

src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ info: 
  license:

    name: ETSI Forge copyright notice

    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt

  version: 1.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1

  version: 1.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1



externalDocs:

  description: ETSI GS NFV-SOL 005 V4.3.1

src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml

+298 −277
Original line number Diff line number Diff line
@@ -696,11 +696,11 @@ definitions: 




  VirtualCpInfo:

    type: object

    description: 'This type represents the information related to a virtual CP instance of a VNF.

      NOTE: A consumer of the VNF LCM interface can learn the actual VNFC instances implementing 

      the service accessible via the virtual CP instance by querying the "vnfcResourceInfo" from

      the "InstantiatedVnfInfo" and filtering by corresponding "vduId" values.'

    type: object

    required:

      - cpInstanceId

      - cpdId
@@ -750,9 +750,6 @@ definitions: 




  AdditionalServiceInfo:

    type: object

    required:

      - portInfo

    description: 

        'This type represents the additional service information of the virtual CP instance

         used to expose properties of the virtual CP to NFV-MANO.
@@ -761,6 +758,9 @@ definitions: 
         to identify the service termination within the VNF, such as for example a URL path

         information in an HTTP request required to allow a single virtual CP IP address to

         be used for several HTTP based services that use the same port number.'

    type: object

    required:

      - portInfo

    properties:

      portInfo:

        description: >
@@ -776,15 +776,16 @@ definitions: 
         $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"

      

  ServicePortInfo:

      description: 

          'This type represents the information related to the service identifying port

          properties exposed by the virtual CP instance.'

      type: object

      required:

        - name

        - protocol

        - port

        - isPortConfigurable

      description: 

          'This type represents the information related to the service identifying port

          properties exposed by the virtual CP instance.'

      

      properties:

        name:

          description: >
@@ -1311,9 +1312,14 @@ definitions: 
    required:

      - id

      - cpdId

      - cpProtocolInfo

    oneOf:

      - required:

        - associatedVnfcCpId

      - required:

        - associatedVipCpId

      - required:

        - associatedVirtualCpId

      - required:

        - associatedVnfVirtualLinkId

    properties:
@@ -1727,11 +1733,12 @@ definitions: 
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVim"



  ExtVirtualLinkInfo:

    type: object

    description: This type represents information about an VNF external VL. 

    type: object

    required:

      - id

      - resourceHandle

      - currentVnfExtCpData

    properties:

      id:

        description: >
@@ -1813,12 +1820,14 @@ definitions: 
        $ref: "#/definitions/IdentifierInVim"



  ExtManagedVirtualLinkInfo:

    type: object

    description: >

      This type provides information about an externally-managed internal virtual link for VNFs

    type: object

    

    required:

      - id

      - vnfVirtualLinkDescId

      - networkResource 

    properties:

      id:

        description: >
@@ -1840,6 +1849,8 @@ definitions: 
      networkResource:

        description: >

          Reference to the VirtualNetwork resource or multi-site connectivity service providing this VL.

        type: array

        items:

          $ref: "../../definitions/SOL005_def.yaml#/definitions/ResourceHandle"

      vnfLinkPorts:

        description: >
@@ -1850,7 +1861,7 @@ definitions: 
      vnfNetAttDefResource:

        description: >

          Network attachment definition resources that provide the specification of the interface

          to attach connection points to this VL..

          to attach connection points to this VL.

        $ref: "#/definitions/NetAttDefResourceInfo"

      

      extManagedMultisiteVirtualLinkId:
@@ -1863,10 +1874,11 @@ definitions: 
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"



  NetAttDefResourceInfo:

    type: object

    description: >

      This type represents the information related to a network attachment definition resource that provides the specification

      of the interface used to connect one or multiple connection points to a secondary container cluster network

    type: object

    

    required:

      - netAttDefResourceInfoId

      - netAttDefResource
@@ -4675,13 +4687,20 @@ definitions: 


  NsLcmInfoModificationRequest:

    description: >

      This type represents attribute modifications for an "Individual NS LCM operation occurrence" resource, i.e. modifications to a resource representation based on the "NsLcmOpOcc" data structure.

      This type represents attribute modifications for an "Individual 

      NS LCM operation occurrence" resource, i.e. modifications to a 

      resource representation based on the "NsLcmOpOcc" data structure.

      NOTE:	The "scheduledTime" attribute represents the new value of 

      the "startTime" attribute of the "NsLcmOpOcc" data structure to 

      start the NS LCM operation.

    type: object

    required:

      - scheduledTime

    properties:

      scheduledTime:

          description: This attribute specifies the modifications to the scheduled time of the specific NS LCM operation. The scheduledTime attribute represents the new value of the "startTime" attribute of the "NsLcmOpOcc" data structure to start the NS LCM operation

          description: This attribute specifies the modifications to 

           the scheduled time of the specific NS LCM operation. 

           See note.

          $ref: "../../definitions/SOL005_def.yaml#/definitions/DateTime"
@@ -5589,7 +5608,10 @@ definitions: 
      layerProtocol:

        description: >

          Identifier of layer(s) and protocol(s).

          Permitted values: IP_OVER_ETHERNET.

          Permitted values: 

          - IP_OVER_ETHERNET

          - IP_FOR_VIRTUAL_CP

          See note.

        type: string

        enum:

          - IP_OVER_ETHERNET
@@ -5607,7 +5629,7 @@ definitions: 
          exposing a virtual CP. It shall be present if

          layerProtocol is equal to “IP_FOR_VIRTUAL_CP” and

          the external CP instance exposes a virtual CP and

          shall not be present otherwise..

          shall not be present otherwise.

        $ref: "#/definitions/VirtualCpAddressData"
@@ -5890,7 +5912,7 @@ definitions: 
      vnfLinkPort:

        description: >

          Externally provided link ports to be used to connect VNFC connection points to this externally-managed VL on

          this network resource. If this attribute is not present, the VNFM shall create the link ports on the

          this network resource. If this attribute is not present, the NFVO or the VNFM shall create the link ports on the

          externally-managed VL.

        type: array

        items:
@@ -5923,6 +5945,10 @@ definitions: 
  IntVnfCpData:

    description: >

      This type represents the input information related to one or more VNF internal CP instances created based on the same CPD. 

      NOTE: Cardinality greater than 1 is only applicable for specific cases where more than one network attachment definition 

      resource is needed to fulfil the connectivity requirements of the VNF internal CP, e.g. to build a link redundant mated 

      pair in SR-IOV cases. When more than one "netAttDefResourceId" is indicated, all shall belong to the same namespace as 

      defined by the corresponding "netAttDefResourceNamespace" attribute in the "NetAttDefResourceData".

    type: object

    required:

      - cpdId
@@ -5937,12 +5963,7 @@ definitions: 
          Identifier of the "NetAttDefResourceData" structure that provides the

          specification of the interface to attach the VNF internal CP created

          from the CPD identified by cpdId to a secondary container cluster network.

          Cardinality greater than 1 is only applicable for specific cases where 

          more than one network attachment definition resource is needed to fulfil

          the connectivity requirements of the VNF internal CP, e.g. to build a link

          redundant mated pair in SR-IOV cases. When more than one "netAttDefResourceId"

          is indicated, all shall belong to the same namespace as defined by the corresponding

          "netAttDefResourceNamespace" attribute in the "NetAttDefResourceData".

          See note.



        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnf"
@@ -6058,10 +6079,10 @@ definitions: 
      attachment definition resource is needed to fulfil the connectivity requirements of the external CP,

      e.g. to build a link redundant mated pair in SR-IOV cases. When more than one "netAttDefResourceId"

      is indicated, all shall belong to the same namespace as defined by the corresponding 

      "netAttDefResourceNamespace" attribute in the "NetAttDefResourceData

      "netAttDefResourceNamespace" attribute in the "NetAttDefResourceData".

      NOTE 5: Either "linkPortId" or "netAttDefResourceId" may be included, but not both.

    type: object

    anyOf:

    oneOf:

      - required:

          - linkPortId

      - required: