Commit 14e566e4 authored by piscione's avatar piscione
Browse files

SOL005_23, SOL005_24 SOL005_v040009

parent 3a671022
Loading
Loading
Loading
Loading
Loading
+85 −10
Original line number Original line Diff line number Diff line
@@ -2321,10 +2321,15 @@ definitions:
      This type specifies an existing VNF instance to be used in the NS instance and
      This type specifies an existing VNF instance to be used in the NS instance and
      if needed, the VNF Profile to use for this VNF instance.
      if needed, the VNF Profile to use for this VNF instance.
      It shall comply with the provisions defined in Table 6.5.3.19-1.
      It shall comply with the provisions defined in Table 6.5.3.19-1.
      NOTE 1: 	If the overridingVnfdId attribute is present the vnfProfileId attribute shall also be present.
      NOTE 2: 	This attribute allows to use an existing VNF instance based on a different VNFD to the one specified
                in the NSD with vnfProfileId, provided both have the same vnfdExtInvariantId.
      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 overrridingVnfdId attribute is present.
    type: object
    type: object
    required:
    required:
      - vnfInstanceId
      - vnfInstanceId
      - vnfProfileId
    properties:
    properties:
      vnfInstanceId:
      vnfInstanceId:
        description: >
        description: >
@@ -2332,17 +2337,52 @@ definitions:
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
      vnfProfileId:
      vnfProfileId:
        description: >
        description: >
          Identifier of (Reference to) a vnfProfile defined in the
          Identifier of (Reference to) a vnfProfile defined in the NSD
          NSD which the existing VNF instance shall be matched
          which the existing VNF instance shall be matched with. If not
          with. If not present, the NFVO will select the VnfProfile
          present, the NFVO will select the VnfProfile matching the
          matching the information in the VNF instance.
          information in the VNF instance. See note 1.
        $ref: "#/definitions/IdentifierInNsd"
        $ref: "#/definitions/IdentifierInNsd"
      overridingVnfdId:
        description: >
          Reference to a VNFD. 
          It replaces the vnfdId indicated in the vnfProfileId. 
          The VNFD referenced by this attribute shall have the same
          vnfdExtInvariantId as the one indicated in the VnfProfile.
          If the VnfProfile does not contain a vnfdExtInvariantId this
          attribute shall be ignored. If the VNFD of the existing VNF
          instance referenced by vnfInstanceId does not match the VNFD
          indicated by this attribute the VNF instance shall not be
          added to the NS instance. See notes 1, 2 and 4.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
      overridingVersionDependency:
        description: >
          If present, information in each overridingVersionDependency replaces
          the versionDependency in the runtime information that the NFVO
          keeps about the VnfProfile, NsProfile or PnfProfile indicated
          in the OverridingVersionDependency.
          Only the versionDependency in the VnfProfile, NsProfile or PnfProfile
          with the same dependentConstituentId as in the overridingVersionDependency
          is replaced. See note 3.
          If no versionDependency with the dependentConstituentId indicated in the
          overridingVersionDependency exists in the VnfProfile, NsProfile
          or PnfProfile, the new versionDependency is added to the runtime
          information that the NFVO keeps about the Profile.
          See note 4.
        $ref: "#/definitions/OverridingVersionDependency"



  NestedNsInstanceData:
  NestedNsInstanceData:
    description: >
    description: >
      This type specifies an existing nested NS instance to be used in the NS instance 
      This type specifies an existing nested NS instance to be used in the NS instance 
      and if needed, the NsProfile to use for this nested NS instance. 
      and if needed, the NsProfile to use for this nested NS instance. 
      It shall comply with the provisions defined in Table 6.5.3.19a-1.
      It shall comply with the provisions defined in Table 6.5.3.19a-1.
      
      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 
      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.

    type: object
    type: object
    required:
    required:
      - nestedNsInstanceId
      - nestedNsInstanceId
@@ -2353,11 +2393,46 @@ definitions:
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
      nsProfileId:
      nsProfileId:
        description: >
        description: >
          Identifier of an NsProfile defined in the NSD which the existing 
          Identifier of an NsProfile defined in the NSD which the existing nested NS instance shall be matched with.
          nested NS instance shall be matched with.
          If not present, the NFVO will select the NsProfile matching the information in the nested NS instance. 
          If not present, the NFVO will select the NsProfile matching the 
          See note 1.
          information in the nested NS instance.

        $ref: "#/definitions/IdentifierInNs"
        $ref: "#/definitions/IdentifierInNsd"
      overridingVnfdId:
        description: >
          Reference to an NSD. 
          It replaces the nsdId indicated in the nsProfileId. 
          The NSD referenced by this attribute shall have the
          same nsdExtInvariantId as the one indicated in the
          NsProfile. If the NsProfile does not contain an
          nsdExtInvariantId this attribute shall be ignored.
          If the NSD of the existing NS instance referenced
          by nestedNsInstanceId does not match the NSD
          indicated by this attribute the NS instance
          shall not be added as nested NS to the composite
          NS instance. 
          See notes 1, 2 and 4.

        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
      overridingVersionDependency:
        description: >
          If present, information in each overridingVersionDependency
          replaces the versionDependency in the runtime information that
          the NFVO keeps about the VnfProfile, NsProfile or PnfProfile
          indicated in the OverridingVersionDependency.
          Only the versionDependency in the VnfProfile, NsProfile
          or PnfProfile with the same dependentConstituentId as in
          the overridingVersionDependency is replaced. See note 3.

          If no versionDependency with the dependentConstituentId indicated
          in the overridingVersionDependency exists in the VnfProfile, NsProfile
          or PnfProfile, the new versionDependency is added to the runtime
          information that the NFVO keeps about the profile.
          See note 4.

        $ref: "#/definitions/OverridingVersionDependency"

      


  SapData:
  SapData:
    description: >
    description: >