Commit 5ead96e1 authored by piscione's avatar piscione
Browse files

Resolved some comments.

parent 42da675a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ definitions:
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
      nsdExtInvariantId:
        description: >
            dentifies an NSD in a version independent manner. This attribute is invariant across versions of the NSD that fulfil 
            Identifies an NSD in a version independent manner. This attribute is invariant across versions of the NSD that fulfil 
            certain conditions related to the external connectivity and management of the NS. It shall be present after the NSD 
            content has been on-boarded if it is included in the NSD and shall be absent otherwise. If present it is copied from 
            the NSD of the on-boarded content.
+95 −28
Original line number Diff line number Diff line
@@ -136,7 +136,12 @@ definitions:
        description: >
          Timestamp indicating the end time of the NS, i.e. the NS
          will be terminated automatically at this timestamp.
          Cardinality "0" indicates the NS termination takes place immediately
          Cardinality "0" indicates the NS termination takes place 
          immediately".If the "Terminate NS" is a scheduled operation, 
          it shall be possible to modify the schedule time, whereas 
          it shall not be possible to change any other operational 
          parameters.	This attribute can be modified with the PATCH method.

        $ref: "../../definitions/SOL005_def.yaml#/definitions/DateTime"
      terminateNsData:
        description: >
@@ -197,7 +202,7 @@ definitions:
      This type represents a response for Query NS operation. 
      It shall comply with the provisions defined in Table 6.5.2.10-1.

      NOTE 1:	If the "nsState" attribute is INSTANTIATED, at least either one
      NOTE 1:	Void.
                "vnfInstance" attribute or one "nestedNsInstanceId" attribute shall be present.
      NOTE 2:	The “priority” attribute of the NS instance is configured in the NSD in the NsDf structure.
                The mapping from application-specific priority values to a value in the NsDf is under OSS/BSS responsibility.
@@ -260,7 +265,6 @@ definitions:
      vnfInstance:
        description: >
          Information on constituent VNF(s) of the NS instance.
          See note 1.
        type: array
        items:
          $ref: "#/definitions/VnfInstance"
@@ -294,7 +298,6 @@ definitions:
      nestedNsInstanceId:
        description: >
          Identifier of the nested NS(s) of the NS instance.
          See note.
        type: array
        items:
          $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
@@ -2787,6 +2790,7 @@ definitions:

      NOTE 1: 	If the overridingNsdId attribute is present the nsProfileId attribute shall also be present.
      NOTE 2: 	This attribute allows to use as nested NS an existing NS instance based on a different NSD to the one 
      specified in the composite NSD with nsProfileId, provided they have the same nsdExtInvariantId.
      NOTE 3:	A VnfProfile, NsProfile or PnfProfile may contain multiple VersionDependencies as it may describe
      the version dependencies of the descriptor referenced in the profile or of other descriptors with the same external invariant identifier.
      NOTE 4: The overridingVersionDependency attribute may only be present if the overridingNsdId attribute is present.
@@ -2916,6 +2920,11 @@ definitions:
          Timestamp indicating the scale time of the NS, i.e. the
          NS will be scaled at this timestamp. Cardinality "0"
          indicates the NS scaling takes place immediately".
          If the "Scale NS" is a scheduled operation, it shall be 
          possible to modify the schedule time, whereas it shall 
          not be possible to change any other operational parameters.
          This attribute can be modified with the PATCH method.

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

  UpdateNsRequest:
@@ -2929,6 +2938,28 @@ definitions:
      NOTE 3:	The operation might be service-disruptive.
      NOTE 4:   For each of the referred vnfInstanceId in the terminateVnfData, there shall be a corresponding value
                in the removeVnfInstanceId.
      NOTE 5: 	A change of VNFD version of a constituent VNF where the source and target VNFD versions have the same
                vnfdExtInvariantId can also be performed without a change in the NSD by  a sequence of two Update NS
                operations, the first one of type RemoveVnf, the second one of type AddVnf or of type InstantiateVnf; 
                or with the Scale NS operation, removing the existing VNF instance and adding a VNF instance with the 
                target VNFD.
      NOTE 6:	When feasibilityCheckReserve is set to FEASIBILITY_CHECK_ONLY, the "updateTime" attribute shall be ignored.
      NOTE 7:	When feasibilityCheckReserve is set to NO_FEASIBILITY_CHECK, the feasibility checking procedure is not 
              performed. Resources might be reserved as triggered by means outside of the present operation request 
              (e.g., configuration or policies), e.g. if it is a scheduled Update NS operation. See Annex A.2.3 in 
              ETSI GS NFV-IFA 010.
      NOTE 8:	When feasibilityCheckReserve is set to FEASIBILITY_CHECK_ONLY, only feasibility checking procedure is 
                performed for the operation, no resources are reserved.
      NOTE 9:	When feasibilityCheckReserve is set to FEASIBILITY_CHECK_WITH_OPERATION, the feasibility checking procedure 
              is performed and based on the procedure result, the actual Update NS operation is performed at the time 
              indicated by the "updateTime" attribute, if provided. Resources might be reserved as triggered by means 
              outside of the present operation request (e.g., configuration or policies), e.g. if it is a scheduled 
              Update NS operation. See Annex A.2.3 in ETSI GS NFV-IFA 010.    
      NOTE 10: When feasibilityCheckReserve is set to FEASIBILITY_CHECK_WITH_RESERVATION_AND_OPERATION, the feasibility 
              checking is performed and based on the procedure result, resources are reserved as part of the feasibility 
              check, and the actual Update NS operation is performed using the resources reserved during the feasibility 
              checking procedure execution, and at the time indicated by the "updateTime" attribute, if provided.      


    type: object
    required:
@@ -2945,7 +2976,7 @@ definitions:
          * OPERATE_VNF: Changing VNF state,
          * MODIFY_VNF_INFORMATION: Modifying VNF information and/or the configurable properties of VNF instance(s)
          * CHANGE_EXTERNAL_VNF_CONNECTIVITY: Changing the external connectivity of VNF instance(s)
          * CHANGE_VNFPKG: Changing the VNF package(s) on which (a) VNF instance(s) is/are based
          * CHANGE_VNFPKG: Changing the VNF package(s) on which (a) VNF instance(s) is/are based (see note 5)
          * ADD_SAP: Adding SAP(s)
          * REMOVE_SAP: Removing SAP(s)
          * ADD_NESTED_NS: Adding existing NS instance(s) as nested NS(s)
@@ -3172,6 +3203,12 @@ definitions:
          Timestamp indicating the update time of the NS, i.e. the
          NS will be updated at this timestamp. Cardinality "0"
          indicates the NS update takes place immediately.
          If the "Update NS" is a scheduled operation, it shall be   
          possible to modify the schedule time, whereas it shall not 
          be possible to change any other operational parameters.
          This attribute can be modified with the PATCH method.
          See note 6.

        $ref: "../../definitions/SOL005_def.yaml#/definitions/DateTime"
      createSnapshotData:
        description: >
@@ -3202,6 +3239,14 @@ definitions:
        type: array
        items:
          $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
      feasibilityCheckReserve:
        description: >
          Specifies the feasibility check and reserve option for the Update NS operation.
          Default option is NO_FEASIBILITY_CHECK. 
          If not present, default value applies.
          See notes 6, 7, 8, 9 and 10.
        $ref: "#/definitions/FeasibilityCheckReserveType"


  InstantiateVnfData:
    description: >
@@ -3235,7 +3280,19 @@ definitions:
              dependencies of the descriptor referenced in the profile or of other descriptors with the same external invariant identifier.
      NOTE 9: The overridingVersionDependency attribute may only be present if the overridingVnfdId attribute is present.
    type: object
    oneOf:
        - required:
            - vnfInstantiationLevelId
        - required:
            - targetScaleLevelInfo
        - required:
            - defaultInstantiationLevel
    properties:
      defaultInstantiationLevel:
        description: >
          Default instantiation level
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"

      vnfdId:
        description: >
          Information sufficient to identify the VNFD which defines
@@ -3252,11 +3309,8 @@ definitions:
      vnfInstantiationLevelId:
        description: >
          Identifier of the instantiation level of the deployment
          flavor to be instantiated. If not present, the default
          instantiation level as declared in the VNFD is
          instantiated.

          See note 2 and 3.
          flavor to be instantiated. 
          See notes 2, 3 and 4.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      targetScaleLevelInfo:
        description: >
@@ -3642,6 +3696,13 @@ definitions:
      nsdInvariantId of the NSD version that is to be associated to this NS instance is different from the one used before, the
      NFVO shall reject the request. Only new versions of the same NSD can be associated to an existing NS instance. This
      data type shall comply with the provisions defined in Table 6.5.3.34-1.
      NOTE: 	The replacement of VNF instances, nested NS instances or PNF instances
          by instances whose descriptor is referenced by the new NSD is applicable even if 
          the instance with a descriptor not referenced from the new NSD has the same 
          VnfdExtInvariantId, NsdExtInvariantId or PnfdExtInvariantId as the new one, i.e. 
          the synchronization procedure is based on descriptor identities of NSD constituents, 
          and does not consider VnfdExtInvariantId, NsdExtInvariantId or PnfdExtInvariantId 
          values.
    type: object
    required:
      - newNsdId
@@ -3668,16 +3729,7 @@ definitions:
          VNFD is referenced by the old NSD version but not
          referenced by the new NSD version, modifying
          information of VNF instances to the new applicable
          VNFD provided in the new NSD version.

          NOTE: 	The replacement of VNF instances, nested NS instances or PNF instances
          by instances whose descriptor is referenced by the new NSD is applicable even if 
          the instance with a descriptor not referenced from the new NSD has the same 
          VnfdExtInvariantId, NsdExtInvariantId or PnfdExtInvariantId as the new one, i.e. 
          the synchronization procedure is based on descriptor identities of NSD constituents, 
          and does not consider VnfdExtInvariantId, NsdExtInvariantId or PnfdExtInvariantId 
          values.

          VNFD provided in the new NSD version. See note.
          A cardinality of 0 indicates that synchronization shall not be done.
        type: boolean

@@ -3975,6 +4027,12 @@ definitions:
      pnfdId:
        description: >
          Identifier of the PNFD on which the PNF is based.
          If different to the one indicated in the referenced PnfProfile it replaces 
          it when adding the PNF to an NS. The PNFD referenced by this attribute shall 
          have the same pnfdExtInvariantId as the one indicated in the PnfProfile. If 
          the PnfProfile does not contain a pnfdExtInvariantId this attribute shall be 
          ignored. See note 1

        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
      pnfProfileId:
        description: >
@@ -7597,7 +7655,9 @@ definitions:

  FeasibilityCheckResultType:
    description: >
      The enumeration FeasibilityCheckResultType defines the permitted values to represent the result of executing a feasibility check according to the options defined in clause 6.5.4.14. It shall comply with the provisions defined in table 6.5.4.15-1.
      The enumeration FeasibilityCheckResultType defines the permitted values to represent the result of 
      executing a feasibility check according to the options defined in clause 6.5.4.14. It shall comply 
      with the provisions defined in table 6.5.4.15-1.
    type: string
    enum:
      - FEASIBILITY_CHECK_DONE
@@ -7605,7 +7665,9 @@ definitions:
      
  FeasibilityCheckReserveType:
    description: >
      The enumeration FeasibilityCheckReserveType defines the permitted values to represent the feasibility check and reserve options applicable for the NS LCM operations. It shall comply with the provisions defined in table 6.5.4.14-1.
      The enumeration FeasibilityCheckReserveType defines the permitted values to represent the feasibility
      check and reserve options applicable for the NS LCM operations. It shall comply with the provisions 
      defined in table 6.5.4.14-1.
    type: string
    enum:
      - NO_FEASIBILITY_CHECK
@@ -7646,12 +7708,17 @@ definitions:
        dataFlowData:
          description: >
              Information about the data flows to be mirrored.
          type: array
          items:
           $ref: "#/definitions/DataFlowData"

  DataFlowData:
      description: >
        This type represents the information about the data flows to be mirrored. 
        It shall comply with the provisions defined in table 6.5.3.101-1.
        NOTE:	A value need not be provided at runtime if the APIconsumer does not 
        intend to refer to a data flow defined in the NSD.

      type: object
      required:
        - DataFlowDetails
@@ -7659,7 +7726,7 @@ definitions:
        dataFlowInfoId:
          description: >
            Identifier of the Data flow information in NSD. It may be provided if a corresponding data flow has been declared in the NSD.
            A value need not be provided at runtime if the APIconsumer does not intend to refer to a data flow defined in the NSD.
            A value need not be provided at runtime if the APIconsumer does not intend to refer to a data flow defined in the NSD. See note.
          $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInNsd"
        dataFlowDetails:
          description: >
@@ -7708,6 +7775,8 @@ definitions:
      description: >
        TThis type represents the information about where the mirrored flow is to be delivered. 
        It shall comply with the provisions defined in table 6.5.3.103-1.
        Note: The collector which is attached to this port can be a virtual machine that uses the mirrored
             data for analysis purpose. The collector is not managed by VIM.
      type: object
      required:
        - collectorId
@@ -7724,9 +7793,7 @@ definitions:
        portId:
          description: >
            Identifier of the collector port managed by VIM where the mirrored flow is to be delivered.
            
            Note: The collector which is attached to this port can be a virtual machine that uses the mirrored
            data for analysis purpose. The collector is not managed by VIM.
            See note.
          $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVim"

  CreateDataFlowMirroring:
+18 −7
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@
definitions:
  NsLcmOperationOccurrenceNotification:
    type: object
    description: This type represents an NS lifecycle management operation occurrence notification, 
     which informs the receiver of changes in the NS lifecycle caused by an NS LCM operation occurrence. 
     The NS LCM operation occurrence may be triggered by the OSS/BSS or automatically triggered by the NFVO.
    required:
      - id
      - nsInstanceId
@@ -22,12 +25,16 @@ definitions:
          multiple times due to multiple subscriptions, the "id"
          attribute of all these notifications shall have the same value.

          NOTE:	Shall be present if the "notificationStatus" is set to "RESULT",
          NOTE 1:	Shall be present if the "notificationStatus" is set to "RESULT", 
          the "verbosity" attribute is set to "FULL" and the operation has performed 
          any resource modification. Shall be absent otherwise. This attribute contains 
          information about the cumulative changes to virtualised resources that were 
          performed so far by the NS LCM operation occurrence and by any of the error 
          handling procedures for that operation occurrence.
          NOTE 2:	In case of failure in feasibility checking, additional information on 
          the failure shall be reported in the "error" attribute of the 
          NsLcmOperationOccurrenceNotification structure along with the result.

        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
      nsInstanceId:
        description: >
@@ -133,14 +140,15 @@ definitions:
          $ref: "../../NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml#/definitions/AffectedSap"
      feasibilityCheckResult:
        description: >
          Information about the feasibility check result. The attribute shall be provided if the notification is sent to indicate the result of feasibility check. See note 2.
          Information about the feasibility check result. The attribute shall be provided if the notification is sent 
          to indicate the result of feasibility check. See note 2.
        $ref: "../../NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml#/definitions/FeasibilityCheckResultType"
      error:
        description: >
          Details of the latest error, if one has occurred during
          executing the LCM operation (see clause 6.3 of ETSI GS NFV SOL 013).
          Shall be present if operationState is "FAILED_TEMP" or
          "FAILED", and shall be absent otherwise.
          "FAILED", and shall be absent otherwise. See note 2. 
        $ref: "../../definitions/SOL005_def.yaml#/definitions/ProblemDetails"
      _links:
        description: >
@@ -438,6 +446,9 @@ definitions:

  NsChangeNotification:
    type: object
    description: This type represents an NS change notification, which informs the receiver of changes on an NS instance 
     caused by an LCM operation occurrence, which directly or indirectly impacts its NS component and is triggered without
     any context of this NS instance. 
    required:
      - id
      - nsInstanceId
+2 −3
Original line number Diff line number Diff line
@@ -281,13 +281,12 @@ definitions:
      vimLevelResourceType:
        description: >
          Additional resource information which is specific to this resource and its type, and which 
          is available from the VIM or the CISM or the resource provider. 
          is available from the VIM or the CISM or the resource provider. See note 1.
        type: string
      
      vimLevelAdditionalResourceInfo:
        description: >
          Type of the resource in the scope of the VIM, the CISM, the WIM or the resource provider.  
          See note 1. 
        $ref: "#/definitions/AdditionalResourceInfo"

      containerNamespace: