Commit e89f0962 authored by piscione's avatar piscione
Browse files

Addressed other comments for SOL005.

parent 5ead96e1
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ info:
  license:
  license:
    name: ETSI Forge copyright notice
    name: ETSI Forge copyright notice
    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
    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:
externalDocs:
  description: ETSI GS NFV-SOL 005 V4.3.1
  description: ETSI GS NFV-SOL 005 V4.3.1
+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ info:
  license:
  license:
    name: ETSI Forge copyright notice
    name: ETSI Forge copyright notice
    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
    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:
externalDocs:
  description: ETSI GS NFV-SOL 005 V4.3.1
  description: ETSI GS NFV-SOL 005 V4.3.1
+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ info:
  license:
  license:
    name: ETSI Forge copyright notice
    name: ETSI Forge copyright notice
    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
    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:
externalDocs:
  description: ETSI GS NFV-SOL 005 V4.3.1
  description: ETSI GS NFV-SOL 005 V4.3.1
+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ info:
  license:
  license:
    name: ETSI Forge copyright notice
    name: ETSI Forge copyright notice
    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
    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:
externalDocs:
  description: ETSI GS NFV-SOL 005 V4.3.1
  description: ETSI GS NFV-SOL 005 V4.3.1
+298 −277
Original line number Original line Diff line number Diff line
@@ -696,11 +696,11 @@ definitions:




  VirtualCpInfo:
  VirtualCpInfo:
    type: object
    description: 'This type represents the information related to a virtual CP instance of a VNF.
    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 
      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 service accessible via the virtual CP instance by querying the "vnfcResourceInfo" from
      the "InstantiatedVnfInfo" and filtering by corresponding "vduId" values.'
      the "InstantiatedVnfInfo" and filtering by corresponding "vduId" values.'
    type: object
    required:
    required:
      - cpInstanceId
      - cpInstanceId
      - cpdId
      - cpdId
@@ -750,9 +750,6 @@ definitions:




  AdditionalServiceInfo:
  AdditionalServiceInfo:
    type: object
    required:
      - portInfo
    description: 
    description: 
        'This type represents the additional service information of the virtual CP instance
        'This type represents the additional service information of the virtual CP instance
         used to expose properties of the virtual CP to NFV-MANO.
         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
         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
         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.'
         be used for several HTTP based services that use the same port number.'
    type: object
    required:
      - portInfo
    properties:
    properties:
      portInfo:
      portInfo:
        description: >
        description: >
@@ -776,15 +776,16 @@ definitions:
         $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"
         $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"
      
      
  ServicePortInfo:
  ServicePortInfo:
      description: 
          'This type represents the information related to the service identifying port
          properties exposed by the virtual CP instance.'
      type: object
      type: object
      required:
      required:
        - name
        - name
        - protocol
        - protocol
        - port
        - port
        - isPortConfigurable
        - isPortConfigurable
      description: 
      
          'This type represents the information related to the service identifying port
          properties exposed by the virtual CP instance.'
      properties:
      properties:
        name:
        name:
          description: >
          description: >
@@ -1311,9 +1312,14 @@ definitions:
    required:
    required:
      - id
      - id
      - cpdId
      - cpdId
      - cpProtocolInfo
    oneOf:
    oneOf:
      - required:
      - required:
        - associatedVnfcCpId
        - associatedVnfcCpId
      - required:
        - associatedVipCpId
      - required:
        - associatedVirtualCpId
      - required:
      - required:
        - associatedVnfVirtualLinkId
        - associatedVnfVirtualLinkId
    properties:
    properties:
@@ -1727,11 +1733,12 @@ definitions:
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVim"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVim"


  ExtVirtualLinkInfo:
  ExtVirtualLinkInfo:
    type: object
    description: This type represents information about an VNF external VL. 
    description: This type represents information about an VNF external VL. 
    type: object
    required:
    required:
      - id
      - id
      - resourceHandle
      - resourceHandle
      - currentVnfExtCpData
    properties:
    properties:
      id:
      id:
        description: >
        description: >
@@ -1813,12 +1820,14 @@ definitions:
        $ref: "#/definitions/IdentifierInVim"
        $ref: "#/definitions/IdentifierInVim"


  ExtManagedVirtualLinkInfo:
  ExtManagedVirtualLinkInfo:
    type: object
    description: >
    description: >
      This type provides information about an externally-managed internal virtual link for VNFs
      This type provides information about an externally-managed internal virtual link for VNFs
    type: object
    
    required:
    required:
      - id
      - id
      - vnfVirtualLinkDescId
      - vnfVirtualLinkDescId
      - networkResource 
    properties:
    properties:
      id:
      id:
        description: >
        description: >
@@ -1840,6 +1849,8 @@ definitions:
      networkResource:
      networkResource:
        description: >
        description: >
          Reference to the VirtualNetwork resource or multi-site connectivity service providing this VL.
          Reference to the VirtualNetwork resource or multi-site connectivity service providing this VL.
        type: array
        items:
          $ref: "../../definitions/SOL005_def.yaml#/definitions/ResourceHandle"
          $ref: "../../definitions/SOL005_def.yaml#/definitions/ResourceHandle"
      vnfLinkPorts:
      vnfLinkPorts:
        description: >
        description: >
@@ -1850,7 +1861,7 @@ definitions:
      vnfNetAttDefResource:
      vnfNetAttDefResource:
        description: >
        description: >
          Network attachment definition resources that provide the specification of the interface
          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"
        $ref: "#/definitions/NetAttDefResourceInfo"
      
      
      extManagedMultisiteVirtualLinkId:
      extManagedMultisiteVirtualLinkId:
@@ -1863,10 +1874,11 @@ definitions:
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"


  NetAttDefResourceInfo:
  NetAttDefResourceInfo:
    type: object
    description: >
    description: >
      This type represents the information related to a network attachment definition resource that provides the specification
      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
      of the interface used to connect one or multiple connection points to a secondary container cluster network
    type: object
    
    required:
    required:
      - netAttDefResourceInfoId
      - netAttDefResourceInfoId
      - netAttDefResource
      - netAttDefResource
@@ -4675,13 +4687,20 @@ definitions:


  NsLcmInfoModificationRequest:
  NsLcmInfoModificationRequest:
    description: >
    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
    type: object
    required:
    required:
      - scheduledTime
      - scheduledTime
    properties:
    properties:
      scheduledTime:
      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"
          $ref: "../../definitions/SOL005_def.yaml#/definitions/DateTime"




@@ -5589,7 +5608,10 @@ definitions:
      layerProtocol:
      layerProtocol:
        description: >
        description: >
          Identifier of layer(s) and protocol(s).
          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
        type: string
        enum:
        enum:
          - IP_OVER_ETHERNET
          - IP_OVER_ETHERNET
@@ -5607,7 +5629,7 @@ definitions:
          exposing a virtual CP. It shall be present if
          exposing a virtual CP. It shall be present if
          layerProtocol is equal to “IP_FOR_VIRTUAL_CP” and
          layerProtocol is equal to “IP_FOR_VIRTUAL_CP” and
          the external CP instance exposes a 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"
        $ref: "#/definitions/VirtualCpAddressData"




@@ -5890,7 +5912,7 @@ definitions:
      vnfLinkPort:
      vnfLinkPort:
        description: >
        description: >
          Externally provided link ports to be used to connect VNFC connection points to this externally-managed VL on
          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.
          externally-managed VL.
        type: array
        type: array
        items:
        items:
@@ -5923,6 +5945,10 @@ definitions:
  IntVnfCpData:
  IntVnfCpData:
    description: >
    description: >
      This type represents the input information related to one or more VNF internal CP instances created based on the same CPD. 
      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
    type: object
    required:
    required:
      - cpdId
      - cpdId
@@ -5937,12 +5963,7 @@ definitions:
          Identifier of the "NetAttDefResourceData" structure that provides the
          Identifier of the "NetAttDefResourceData" structure that provides the
          specification of the interface to attach the VNF internal CP created
          specification of the interface to attach the VNF internal CP created
          from the CPD identified by cpdId to a secondary container cluster network.
          from the CPD identified by cpdId to a secondary container cluster network.
          Cardinality greater than 1 is only applicable for specific cases where 
          See note.
          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".


        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnf"
        $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,
      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"
      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 
      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.
      NOTE 5: Either "linkPortId" or "netAttDefResourceId" may be included, but not both.
    type: object
    type: object
    anyOf:
    oneOf:
      - required:
      - required:
          - linkPortId
          - linkPortId
      - required:
      - required:
Loading