Commit d029cd5c authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

fixed issue #22

parent fdc17a50
Loading
Loading
Loading
Loading
Loading
+62 −38
Original line number Diff line number Diff line
@@ -2367,8 +2367,15 @@ definitions:
      and the actual NS instantiation operation is performed using the resources reserved during the feasibility checking
      procedure execution, and at the time indicated by the "startTime" attribute, if provided.

    required:
    oneOf:
      - required:
          - nsFlavourId
      - required:
          - nsFlavourId
          - nsInstantiationLevelId
      - required:
          - nsFlavourId
          - targetNsScaleLevelInfo
    properties:
      nsFlavourId:
        description: >
@@ -2754,9 +2761,12 @@ definitions:
                 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 overridingVnfdId attribute is present.
    type: object
    anyOf:
    oneOf:
      - required:
          - vnfInstanceId
      - required:
          - vnfInstanceId
            - overridingVnfdId
      - required:
          - vnfInstanceId
          - overridingVnfdId
@@ -2818,9 +2828,12 @@ definitions:
      NOTE 4: The overridingVersionDependency attribute may only be present if the overridingNsdId attribute is present.

    type: object
    anyOf:
    oneOf:
      - required:
          - nestedNsInstanceId
      - required:
          - nestedNsInstanceId
          - overridingNsdId
      - required:
          - nestedNsInstanceId
          - overridingNsdId
@@ -3304,9 +3317,9 @@ 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:
      - anyOf:
          - anyOf:
      - oneOf:
        - required:
            - vnfdId
            - vnfFlavourId
@@ -3317,7 +3330,6 @@ definitions:
            - vnfInstantiationLevelId
            - overridingVnfdId
            - overridingVersionDependency
                - vnfProfileId
        - required:
            - vnfdId
            - vnfFlavourId
@@ -3326,14 +3338,13 @@ definitions:
            - vnfFlavourId
            - overridingVnfdId
            - overridingVersionDependency
                - vnfProfileId
      - anyOf:
      - oneOf:
        - required:
              - vnProfileId
            - vnfProfileId
        - required:
            - vnfProfileId
            - overridingVnfdId
            - overridingVersionDependency
              - vnfProfileId

    properties:
      defaultInstantiationLevel:
@@ -3507,9 +3518,18 @@ definitions:
      are not scalable, the default instantiation level as declared in the VNFD
      shall be used for instantiation.
    type: object
    oneOf:
      - required:
          - vnfInstanceId
          - newFlavourId
      - required:
          - vnfInstanceId
          - newFlavourId
          - instantiationLevelId
      required:
          - vnfInstanceId
          - newFlavourId
          - targetScaleLevelInfo
    properties:
      vnfInstanceId:
        description: >
@@ -5903,15 +5923,19 @@ definitions:
      container infrastructure service is a Kubernetes® instance is a network 
      attachment definition (NAD).
    type: object
    anyOf:
    oneOf:
      - required:
          - vnfVirtualLinkDescId
          - resourceId
      - required:
          - vnfVirtualLinkDescId
          - resourceId
          - intCp
          - netAttDefResourceData
      - required:
          - vnfVirtualLinkDescId
          - resourceId
          - netAttDefResourceData
          - intCp
    properties:
      extManagedVirtualLinkId:
        description: >