Commit cd69d355 authored by Muhammad Hamza's avatar Muhammad Hamza
Browse files

resolve issues raised by Vlademir in SOL002 v4.3.1

parent b73b2a7b
Loading
Loading
Loading
Loading
Loading
+31 −28
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ definitions:
  VimConnectionInfo:
    description: >
      This type represents parameters to connect to a VIM, a CISM, a CIR or a MCIOP repository for managing
      the resources of a VNF instance. It shall comply with the provisions defined in table 4.4.1.6-1.
      the resources of a VNF instance.

      This structure is used to convey VIM-related, CISM-related, CIR-related, or MCIOP-repository-relate 
      dparameters over the Or-Vnfm interface. Additional parameters for a VIM, a CISM, a CIR or a MCIOP
@@ -355,12 +355,12 @@ definitions:
                    last key from the map removes the affected instance of the "VnfExtCpData" structure from
                    its parent data structure.
      * NOTE 4:   If, as defined by the input parameters of a "ChangeVnfFlavour", "ChangeExtVnfConnectivity" or
                    "ChangeCurrentVnfPkg" operation or as part of the Grant response for any of these operations, a 
                    cpConfig map entry identified by a particular map key value is moved into another "ExtVirtualLinkData"
                    or "VnfExtCpData" structure, this particular cpConfig map entry may be used by an external CP instance
                    different than the one that has used it before the operation, or by no external CP instance at all.
                    Renaming a CPD identifier during the "changeCurrentVnfPkg" operation does not count as moving the
                    related "cpConfig" map entries to a new "extCpData" structure.
                  "ChangeCurrentVnfPkg" operation, a cpConfig map entry identified by a particular map key value 
                  is moved into another "ExtVirtualLinkData" or "VnfExtCpData" structure, this particular cpConfig
                  map entry may be used by an external CP instance different than the one that has used it before the
                  operation, or by no external CP instance at all. Renaming a CPD identifier during the "changeCurrentVnfPkg"
                  operation does not count as moving the related "cpConfig" map entries to a new "extCpData" structure.

    type: object
    required:
      - cpdId
@@ -433,6 +433,7 @@ definitions:
          in "VnfExtCpConfig" structures that provide configuration information for a CP which represents a sub-port in
          a trunk, and if parent ports are supported.
        $ref: "#/definitions/IdentifierInVnf"
      
      linkPortId:
        description: >
          Identifier of a pre-configured link port to which the external CP
@@ -448,6 +449,14 @@ definitions:
          instance for which a dedicated IP address is allocated. It shall be present in that case and shall be absent otherwise.
        type: boolean

      cpProtocolData:
        description: >
          Parameters for configuring the network protocols on the
          link port that connects the CP to a VL. See notes 1 and 2.
        type: array
        items:
          $ref: "#/definitions/CpProtocolData"

      netAttDefResourceId:
        description: >
          Identifier of the “NetAttDefResourceData” structure that
@@ -462,13 +471,6 @@ definitions:
        type: array
        items:
          $ref: "#/definitions/Identifier"
      cpProtocolData:
        description: >
          Parameters for configuring the network protocols on the
          link port that connects the CP to a VL. See notes 1 and 2.
        type: array
        items:
          $ref: "#/definitions/CpProtocolData"

  CpProtocolData:
    description: >
@@ -490,6 +492,7 @@ definitions:
        type: string
        enum:
          - IP_OVER_ETHERNET
          - IP_FOR_VIRTUAL_CP
      ipOverEthernet:
        description: >
          Network address data for IP over Ethernet to assign to the external CP
@@ -618,7 +621,7 @@ definitions:
  VirtualCpAddressData:
    description: >
      This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to an 
      NS VL. It shall comply with the provisions defined in table 5.5.3.6d-1.
      NS VL.

      * NOTE 1: If the container cluster is set up to be able to configure an external load balancer this address will be used,
                otherwise it will be ignored by the CISM.
@@ -650,16 +653,15 @@ definitions:
                Moreover, the identifier of the VIM connection provides scope to the resourceId.

      * NOTE 2:	A link port is not needed for an external CP instance that exposes a VIP CP in the following cases:
                1 For a VIP CP directly exposed as an external CP:
                  1.1 No dedicated IP address is allocated as VIP address, as indicated in the VNFD.
                  1.2 A dedicated IP address is allocated as VIP address, but the NFVO indicates that no port is needed
                1)  For a VIP CP directly exposed as an external CP:
                    1.1)  No dedicated IP address is allocated as VIP address, as indicated in the VNFD.
                    1.2)  A dedicated IP address is allocated as VIP address, but the NFVO indicates that no port is needed
                          (createExtLinkPort in VnfExtCpConfig set to false).
                2 For a VIP CP exposed as an external CP via a floating IP address:
                  2.1 No dedicated IP address is allocated as VIP address, as indicated in the VNFD, and the VNFC CP
                2)  For a VIP CP exposed as an external CP via a floating IP address:
                    2.1)  No dedicated IP address is allocated as VIP address, as indicated in the VNFD, and the VNFC CP
                          associated to the VIP CP is also exposed via a floating IP address.
                3 For a VIRTUAL CP exposed as an external CP.
                4 For a VNFC CP exposed as an external CP in a secondary container cluster external network or a
                secondary container cluster internal network.
                3)  For a VIRTUAL CP exposed as an external CP.
                4)  For a VNFC CP exposed as an external CP in a secondary container cluster external network.

      * 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).
@@ -754,6 +756,8 @@ definitions:
    description: >
      This type represents additional resource information which resource and resource type
      specific, and which is available from the VIM or the CISM or the resource provider.

      * NOTE: At least one attribute shall be present.
    type: object
    properties:
      hostName:
@@ -970,7 +974,6 @@ definitions:
      VNF lifecycle operation types in VNF lifecycle management operation 
      occurrence resources and VNF lifecycle management operation occurrence 
      notifications.
      It shall comply with the provisions defined in table 5.5.4.5-1.

      Value | Description
      ------|------------
+3 −4
Original line number Diff line number Diff line
@@ -4,8 +4,7 @@
definitions:
  Alarm:
    description: >
      The alarm data type encapsulates information about an alarm. It shall comply with the provisions defined in 
      table 7.5.2.4-1.
      The alarm data type encapsulates information about an alarm.

      If the attribute "faultType" has the value "NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE", 
      the following provisions apply for the values of the attribute "faultDetails" related to 
@@ -480,7 +479,7 @@ definitions:
  FmNotificationsFilter:
    description: >
      This type represents a subscription filter related to notifications about VNF faults.
      It shall comply with the provisions defined in table 7.5.3.2-1.

      At a particular nesting level in the filter structure, the following applies: All attributes 
      shall match in order for the filter to match (logical "and" between different filter attributes). 
      If an attribute is an array, the attribute shall match if at least one of the values in the array 
+5 −5
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
definitions:  
  VnfIndicator:
    description: >
      This type represents a VNF indicator value. It shall comply with the provisions defined in table 8.5.2.2-1.
      This type represents a VNF indicator value.

      NOTE:	ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications.
    type: object
@@ -51,7 +51,7 @@ definitions:
  VnfIndicatorNotificationsFilter:
    description: >
      This type represents a subscription filter for notifications related to VNF indicators.
      It shall comply with the provisions defined in table 8.5.3.2-1. 

      At a particular nesting level in the filter structure, the following applies: 
      All attributes shall match in order for the filter to match (logical "and" between different 
      filter attributes). If an attribute is an array, the attribute shall match if at least one of 
@@ -152,7 +152,7 @@ definitions:

  VnfIndicatorValueChangeNotification:
    description: >
      This type represents a VNF indicator value change notification. It shall comply with the provisions defined in table 8.5.2.5-1.
      This type represents a VNF indicator value change notification.
      The notification shall be triggered by the VNFM when the value of an indicator has changed.

      NOTE:	ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications.
@@ -226,7 +226,7 @@ definitions:
  SupportedIndicatorsChangeNotification:
    description: >
      This type represents a notification to inform the receiver that the set of indicators supported 
      by a VNF instance has changed. It shall comply with the provisions defined in table 8.5.2.6-1.
      by a VNF instance has changed.
      
      The notification shall be triggered by the VNFM when the set of supported VNF indicators has changed 
      as a side effect of the "Change current VNF package" operation. It may be triggered by the VNFM when 
+39 −42
Original line number Diff line number Diff line
@@ -1068,8 +1068,7 @@ definitions:

  ExtManagedVirtualLinkInfo:
    description: >
      This type provides information about an externally-managed virtual link. It shall 
      comply with the provisions defined in table 5.5.3.5-1.
      This type provides information about an externally-managed virtual link.
    type: object
    required:
      - id
@@ -1899,6 +1898,7 @@ definitions:
        type: string
        enum:
          - ADDED
          - MODIFIED
          - REMOVED
      extCpInstanceId:
        description: >
@@ -1987,6 +1987,8 @@ definitions:
          $ref: "#/definitions/VnfcInfoModifications"

  CreateVnfRequest:
    description: >
      This type represents request parameters for the "Create VNF identifier" operation.
    type: object
    required:
      - vnfdId
@@ -2013,8 +2015,7 @@ definitions:

  ScaleVnfRequest:
    description: >
      This type represents request parameters for the "Scale VNF" operation. It shall comply with the provisions defined in
      table 5.5.2.5-1. See clause B.2 in annex B for an explanation of VNF scaling.
      This type represents request parameters for the "Scale VNF" operation.
    type: object
    required:
      - type
@@ -2053,8 +2054,6 @@ definitions:
  ScaleVnfToLevelRequest:
    description: >
      This type represents request parameters for the "Scale VNF to Level" operation.
      It shall comply with the provisions defined in table 5.5.2.6-1. See clause B.2 
      for an explanation of VNF scaling.

      NOTE:	Either the instantiationLevelId attribute or the scaleInfo attribute shall 
            be included.
@@ -2177,7 +2176,7 @@ definitions:
  
  ExtVirtualLinkInfo:
    description: >
      This type represents information about an external VL. It shall comply with the provisions defined in table 5.5.3.2-1.
      This type represents information about an external VL.

      NOTE:	This attribute reflects the current configuration information that has resulted from merging into this attribute 
            the "VnfExtCpData" information which was passed as part of the "ExtVirtualLinkData" structure in the input of the 
@@ -2225,8 +2224,7 @@ definitions:

  VnfLinkPortInfo:
    description: >
      This type represents a link port of an internal VL of a VNF. It shall comply with the provisions 
      defined in table 5.5.3.8 1.
      This type represents a link port of an internal VL of a VNF.

      NOTE 1: Either cpInstanceId with cpInstanceType set to "EXT_CP" or any combination of cpInstanceId
              with cpInstanceType set to "VNFC_CP" and vipCpInstanceId (i.e. one or both of them) shall be 
@@ -2294,7 +2292,7 @@ definitions:
  ExtLinkPortInfo:
    description: >
      This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to 
      an NS VL. It shall comply with the provisions defined in table 5.5.3.9-1.
      an NS VL.

      NOTE 1:	The use cases UC#4 and UC#5 in clause A.4 of ETSI GS NFV-IFA 007 provide examples for such a configuration.
      NOTE 2:	The value of "trunkResourceId" is scoped by the value of "vimConnectionId" in the "resourceHandle" attribute.
@@ -2337,7 +2335,6 @@ definitions:
  CpProtocolInfo:
    description: >
      This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses.
      It shall comply with the provisions defined in table 5.5.3.9b-1.

      NOTE:	This attribute allows to signal the addition of further types of layer and protocol in future versions of the 
            present document in a backwards-compatible way. In the current version of the present document, only IP over 
@@ -2351,12 +2348,13 @@ definitions:
          The identifier of layer(s) and protocol(s) associated to the network address information.
          
          Permitted values:
            1. IP_OVER_ETHERNET
            2. IP_FOR_VIRTUAL_CP
            - IP_OVER_ETHERNET
            - IP_FOR_VIRTUAL_CP
          See note.
        type: string
        enum:
          - IP_OVER_ETHERNET
          - IP_FOR_VIRTUAL_CP
      ipOverEthernet:
        description: >
          IP addresses over Ethernet to assign to the extCP instance. Shall be
@@ -2373,7 +2371,6 @@ definitions:
  IpOverEthernetAddressInfo:
    description: >
      This type represents information about a network address that has been assigned.
      It shall comply with the provisions defined in table 5.5.3.10-1.

      NOTE 1:	At least one of "macAddress" or "ipAddresses" shall be present.
      NOTE 2:	Exactly one of "addresses" or "addressRange" shall be present.
@@ -2490,7 +2487,7 @@ definitions:
  LifecycleChangeNotificationsFilter:
    description: >
      This type represents a subscription filter related to notifications about VNF lifecycle changes.
      It shall comply with the provisions defined in table 5.5.3.12-1. 

      At a particular nesting level in the filter structure, the following applies: All attributes shall 
      match in order for the filter to match (logical "and" between different filter attributes). 
      If an attribute is an array, the attribute shall match if at least one of the values in the array 
@@ -2569,7 +2566,6 @@ definitions:
  VnfExtCpInfo:
    description: >
      This type represents information about an external CP of a VNF.
      It shall comply with the provisions defined in table 5.5.3.17 1.

      NOTE 1:	The attributes "associatedVnfcCpId", "associatedVipCpId", "associatedVirtualCpId" and 
              "associatedVnfVirtualLinkId" are mutually exclusive. Exactly one shall be present.
@@ -2888,7 +2884,6 @@ definitions:
      when changing the current VNF package. The attributes that can be included consist of those requested to 
      be modified explicitly in the "ChangeCurrentVnfPkgRequest" data structure, and additional attributes of the 
      "VnfInstance" data structure that were modified implicitly during the operation.
      The "ModificationsTriggeredByVnfPkgChange" data type shall comply with the provisions defined in table 5.5.3.21-1.

      NOTE 1:	This attribute represents the delta (semantics as per IETF RFC 7396, JSON Merge Patch) between the value 
              of the attribute at the start of the "Change current VNF package" operation and the value of the attribute 
@@ -2900,19 +2895,20 @@ definitions:
    properties:
      vnfConfigurableProperties:
        description: >
          This attribute signals the modifications of the "vnfConfigurableProperties" attribute in "VnfInstance" performed 
          by the operation and shall be present if that attribute was modified during the operation. See note 1.
          This attribute signals the modifications of the "vnfConfigurableProperties" attribute in "VnfInstance"
          performed  by the operation and shall be present if that attribute was modified during the operation.
          See note 1.
          In addition, the provisions in clause 5.7 shall apply.
        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs"
      metadata:
        description: >
          This attribute signals the modifications of the "metadata" attribute in "VnfInstance" performed by the operation and 
          shall be present if that attribute was modified during the operation. See note 1.
          This attribute signals the modifications of the "metadata" attribute in "VnfInstance" performed by
          the operation and  shall be present if that attribute was modified during the operation. See note 1.
        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs"
      extensions:
        description: >
          This attribute signals the modifications of the "extensions" attribute in "VnfInstance" performed by the operation and 
          shall be present if that attribute was modified during the operation. See note 1.
          This attribute signals the modifications of the "extensions" attribute in "VnfInstance" performed by
          the operation and  shall be present if that attribute was modified during the operation. See note 1.
          In addition, the provisions in clause 5.7 shall apply.
        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs"
      vnfdId:
@@ -2921,19 +2917,23 @@ definitions:
        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier"
      vnfProvider:
        description: >
          If present, this attribute signals the new value of the "vnfProvider" attribute in "VnfInstance". See note 2.
          If present, this attribute signals the new value of the "vnfProvider" attribute in "VnfInstance".
          See note 2.
        type: string
      vnfProductName:
        description: >
          If present, this attribute signals the new value of the "vnfProductName" attribute in "VnfInstance". See note 2.
          If present, this attribute signals the new value of the "vnfProductName" attribute in "VnfInstance".
          See note 2.
        type: string
      vnfSoftwareVersion:
        description: >
          If present, this attribute signals the new value of the "vnfSoftwareVersion" attribute in "VnfInstance". See note 2.
          If present, this attribute signals the new value of the "vnfSoftwareVersion" attribute in "VnfInstance".
          See note 2.
        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Version"
      vnfdVersion:
        description: >
          If present, this attribute signals the new value of the "vnfdVersion" attribute in "VnfInstance". See note 2.
          If present, this attribute signals the new value of the "vnfdVersion" attribute in "VnfInstance".
          See note 2.
        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Version"
      vimConnectionInfo:
        description: >
@@ -2958,8 +2958,8 @@ definitions:

  McioTypeName:
    description: >
      The present type definition provides valid string values for the "mcioType" attribute of the "McioInfo" data type , and
      the valid values are defined in table 5.5.4.9-1.
      The present type definition provides valid string values for the "mcioType" attribute of the "McioInfo"
      data type , and the valid values are defined in table 5.5.4.9-1.
    type: string
    enum:
      - Deployment
@@ -3007,8 +3007,7 @@ definitions:

  VipCpInfo:
    description: >
      This type provides information related to virtual IP (VIP) CP. It shall comply with the provisions
      defined in table 5.5.3.28-1.
      This type provides information related to virtual IP (VIP) CP.

      NOTE 1:	It is possible that there is no associated VnfcCp because the VIP CP is available but not
      associated yet.
@@ -3192,8 +3191,7 @@ definitions:

  VirtualCpInfo:
    description: >
      This type provides information related to a virtual CP instance of a VNF. It shall comply with the provisions 
      in table 5.5.3.31-1.
      This type provides 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" 
@@ -3248,7 +3246,7 @@ definitions:
  AdditionalServiceInfo:
    description: >
      This type provides additional service information of the virtual CP instance used to expose properties of the 
      virtual CP to NFV-MANO. It shall comply with the provisions in table 5.5.3.32-1.
      virtual CP to NFV-MANO.

      NOTE: This attribute shall only be present if additional information is needed to identify the service 
            termination within the VNF, such as for example a URL path information in an HTTP request required 
@@ -3273,8 +3271,7 @@ definitions:

  ServicePortInfo:
    description: >
      This type describes the service identifying port properties exposed by the virtual CP instance. It shall 
      comply with the provisions in table 5.5.3.33-1.
      This type describes the service identifying port properties exposed by the virtual CP instance.
    type: object
    required:
      - name
@@ -3311,7 +3308,7 @@ definitions:
    description: >
      This type contains 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. It shall comply with the provisions defined in table 5.5.3.36-1.
      cluster network.
    type: object
    required:
      - netAttDefResourceInfoId
+5 −0
Original line number Diff line number Diff line
@@ -180,6 +180,11 @@ definitions:
          Information about virtual CP instances that were affected during the execution of the 
          lifecycle management operation, if this notification represents the result of a lifecycle 
          management operation occurrence.

          Shall be present if the "notificationStatus" is set to "RESULT", the "verbosity" attribute is
          set to "FULL" and the operation has made any changes to the virtual CP instances of the VNF instance.
          Shall be absent otherwise. Only information about virtual CP instances that have been added, deleted
          or modified shall be provided.
        type: array
        items:
          $ref: "../../VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/AffectedVirtualCp"
Loading