Commit 778626c9 authored by Samir Medjiah's avatar Samir Medjiah
Browse files

SOL005: Fixed bug while refactoring common data types

parent 30b52146
Loading
Loading
Loading
Loading
+25 −28
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ definitions:
          flavourId:
            description: >
              Identifier of the VNF deployment flavor applied to this VNF instance.
            $ref: "#/definitions/IdentifierInVnfd"
            $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
          vnfState:
            description: >
              The state of the VNF instance.
@@ -560,7 +560,7 @@ definitions:
      aspectId:
        description: >
          Identifier of the scaling aspect.
        $ref: "#/definitions/IdentifierInVnfd"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      scaleLevel:
        description: >
          Indicates the scale level. The minimum value shall be 0 and the
@@ -913,7 +913,7 @@ definitions:
      cpdId:
        description: >
          Identifier of the external CPD, VnfExtCpd, in the VNFD.
        $ref: "#/definitions/IdentifierInVnfd"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      cpProtocolInfo:
        description: >
          Network protocol information for this CP.
@@ -1154,7 +1154,7 @@ definitions:
                the VIM.
                In case this attribute is present, IP addresses are bound
                to that subnet.
              $ref: "#/definitions/IdentifierInVim"
              $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVim"


      type:
@@ -1210,7 +1210,7 @@ definitions:
          resource in the VIM.
          In case this attribute is present, IP addresses
          are bound to that subnet.
        $ref: "#/definitions/IdentifierInVim"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVim"

  ExtVirtualLinkInfo:
    type: object
@@ -1278,7 +1278,7 @@ definitions:
      vnfVirtualLinkDescId:
        description: >
          Identifier of the VNF Virtual Link Descriptor (VLD) in the VNFD.
        $ref: "#/definitions/IdentifierInVnfd"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      networkResource:
        description: >
          Reference to the VirtualNetwork resource.
@@ -1344,7 +1344,7 @@ definitions:
      id:
        description: >
          Identifier of the monitoring parameter defined in the VNFD.
        $ref: "#/definitions/IdentifierInVnfd"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      name:
        description: >
          Human readable name of the monitoring parameter, as defined in the VNFD.
@@ -1381,7 +1381,7 @@ definitions:
      vduId:
        description: >
          Reference to the applicable VDU in the VNFD.
        $ref: "#/definitions/IdentifierInVnfd"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      computeResource:
        description: >
          Reference to the VirtualCompute resource.
@@ -1419,7 +1419,7 @@ definitions:
            cpdId:
              description: >
                Identifier of the VDU CPD, cpdId, in the VNFD.
              $ref: "#/definitions/IdentifierInVnfd"
              $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
            vnfExtCpId:
              description: >
                When the VNFC CP is exposed as external CP of the VNF, the
@@ -1463,7 +1463,7 @@ definitions:
      vnfVirtualLinkDescId:
        description: >
          Identifier of the VNF Virtual Link Descriptor (VLD) in the VNFD.
        $ref: "#/definitions/IdentifierInVnfd"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      networkResource:
        description: >
          Reference to the VirtualNetwork resource.
@@ -1504,7 +1504,7 @@ definitions:
      virtualStorageDescId:
        description: >
          Identifier of the VirtualStorageDesc in the VNFD.
        $ref: "#/definitions/IdentifierInVnfd"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      storageResource:
        description: >
          Reference to the VirtualStorage resource.
@@ -2175,14 +2175,14 @@ definitions:
      vnfFlavourId:
        description: >
          Identifier of the VNF deployment flavor to be instantiated.
        $ref: "#/definitions/IdentifierInVnfd"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      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.
        $ref: "#/definitions/IdentifierInVnfd"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      vnfInstanceName:
        description: >
          Human-readable name of the VNF instance to be created.
@@ -2231,14 +2231,14 @@ definitions:
      newFlavourId:
        description: >
          Identifier of the VNF deployment flavor to be instantiated.
        $ref: "#/definitions/IdentifierInVnfd"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      instantiationLevelId:
        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.
        $ref: "#/definitions/IdentifierInVnfd"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      extVirtualLinks:
        description: >
          Information about external VLs to connect the VNF to.
@@ -2746,7 +2746,7 @@ definitions:
      virtualLinkDescId:
        description: >
          Identifier of the related VLD in the VNFD.
        $ref: "#/definitions/IdentifierInVnfd"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      changeType:
        description: >
          Signals the type of change. Permitted values:
@@ -2798,7 +2798,7 @@ definitions:
      virtualStorageDescId:
        description: >
          Identifier of the related VirtualStorage descriptor in the VNFD.
        $ref: "#/definitions/IdentifierInVnfd"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      changeType:
        description: >
          Signals the type of change. Permitted values:
@@ -3543,7 +3543,7 @@ definitions:
        description: >
          Identifier of the target instantiation level of the current
          deployment flavor to which the VNF is requested to be scaled.
        $ref: "#/definitions/IdentifierInVnfd"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      vnfScaleInfo:
        description: >
          For each scaling aspect of the current deployment
@@ -3571,7 +3571,7 @@ definitions:
        description: >
          Identifier of (reference to) the aspect of the VNF that is
          requested to be scaled, as declared in the VNFD.
        $ref: "#/definitions/IdentifierInVnfd"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      numberOfSteps:
        description: >
          Number of scaling steps. It shall be a positive number.
@@ -3979,7 +3979,7 @@ definitions:
                In case this attribute is present, IP addresses from that
                subnet will be assigned; otherwise, IP addresses not bound to
                a subnet will be assigned.
              $ref: "#/definitions/IdentifierInVim"
              $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVim"

  ExtVirtualLinkData:
    description: >
@@ -4012,7 +4012,7 @@ definitions:
        description: >
          The identifier of the resource in the scope of the VIM or
          the resource provider.
        $ref: "#/definitions/IdentifierInVim"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVim"
      extCps:
        description: >
          External CPs of the VNF to be connected to this external VL.
@@ -4044,7 +4044,7 @@ definitions:
      vmfVirtualLinkDescId:
        description: >
          The identifier of the VLD in the VNFD for this VL.
        $ref: "#/definitions/IdentifierInVnfd"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      vimId:
        description: >
          Identifier of the VIM that manage this resource. This
@@ -4063,7 +4063,7 @@ definitions:
        description: >
          The identifier of the resource in the scope of the VIM or
          the resource provider.
        $ref: "#/definitions/IdentifierInVim"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVim"

  VnfExtCpData:
    description: >
@@ -4076,7 +4076,7 @@ definitions:
      cpdId:
        description: >
          The identifier of the CPD in the VNFD.
        $ref: "#/definitions/IdentifierInVnfd"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      cpConfig:
        description: >
          List of instance data that need to be configured on the CP instances
@@ -4190,10 +4190,7 @@ definitions:
      It is expected to be unique within the VIM instance. Representation: string of variable length.
    type: string

  IdentifierInVnfd:
    description: >
      Identifier of the VNF Virtual Link Descriptor (VLD) in the VNFD.
    type: string


  IdentifierInVnf:
    description: >
+11 −0
Original line number Diff line number Diff line
@@ -234,6 +234,17 @@ definitions:
          complements the ResourceHandle.
        type: string

  IdentifierInVim:
    description: >
      An identifier maintained by the VIM or other resource provider.
      It is expected to be unique within the VIM instance. Representation: string of variable length.
    type: string

  IdentifierInVnfd:
    description: >
      Identifier of the VNF Virtual Link Descriptor (VLD) in the VNFD.
    type: string
    
  ApiVersionInformation:
    description: >
      This type represents API version information.