fixed issue #17

src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml

@@ -12,7 +12,7 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 2.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 2.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:2
 
 externalDocs:
   description: ETSI GS NFV-SOL 005 V3.3.1

src/SOL005/VNFPackageManagement/definitions/SOL005VNFPackageManagement_def.yaml

@@ -618,6 +618,13 @@ definitions:
       If an attribute is an array, the attribute shall match if at least one of the values in the array matches
       (logical "or" between the values of one filter attribute).
     type: object
+    oneOf:
+      - required:
+          - vnfProductsFromProviders
+      - required:
+          - vnfdId
+      - required:
+          - vnfPkgId
     properties:
       notificationTypes:
         description: >
@@ -637,13 +644,6 @@ definitions:
           type: object
           required:
             - vnfProvider
-          oneOf:
-            - required:
-                - vnfProductsFromProviders
-            - required:
-                - vnfdId
-            - required:
-                - vnfPkgId
           properties:
             vnfProvider:
               description: >
@@ -689,51 +689,51 @@ definitions:
                           type: array
                           items:
                             $ref: "../../definitions/SOL005_def.yaml#/definitions/Version"
-            vnfdId:
-              description: >
-                Match VNF packages with a VNFD identifier
-                listed in the attribute.
-              type: array
-              items:
-                $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
-            vnfPkgId:
-              description: >
-                Match VNF packages with a package identifier
-                listed in the attribute.
-                May be present if the "notificationTypes"
-                attribute contains the value
-                "VnfPackageChangeNotification", and shall be
-                absent otherwise.
-              type: array
-              items:
-                $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
-            operationalState:
-              description: >
-                Match VNF packages with a package identifier
-                listed in the attribute.
-                May be present if the "notificationTypes"
-                attribute contains the value
-                "VnfPackageChangeNotification", and shall be
-                absent otherwise.
-              type: array
-              items:
-                $ref: "#/definitions/PackageOperationalStateType"
-            usageState:
-              description: >
-                Match particular usage state of the on-boarded VNF package.
-                May be present if the "notificationTypes"
-                attribute contains the value
-                "VnfPackageChangeNotification", and shall be
-                absent otherwise.
-              type: array
-              items:
-                $ref: "#/definitions/PackageUsageStateType"
-            vnfmInfo:
-              description: >
-                Match strings that specify VNFMs compatible with the VNF. See Table 9.5.2.5-1.
-              type: array
-              items:
-                type: string
+      vnfdId:
+        description: >
+          Match VNF packages with a VNFD identifier
+          listed in the attribute.
+        type: array
+        items:
+          $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
+      vnfPkgId:
+        description: >
+          Match VNF packages with a package identifier
+          listed in the attribute.
+          May be present if the "notificationTypes"
+          attribute contains the value
+          "VnfPackageChangeNotification", and shall be
+          absent otherwise.
+        type: array
+        items:
+          $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
+      operationalState:
+        description: >
+          Match VNF packages with a package identifier
+          listed in the attribute.
+          May be present if the "notificationTypes"
+          attribute contains the value
+          "VnfPackageChangeNotification", and shall be
+          absent otherwise.
+        type: array
+        items:
+          $ref: "#/definitions/PackageOperationalStateType"
+      usageState:
+        description: >
+          Match particular usage state of the on-boarded VNF package.
+          May be present if the "notificationTypes"
+          attribute contains the value
+          "VnfPackageChangeNotification", and shall be
+          absent otherwise.
+        type: array
+        items:
+          $ref: "#/definitions/PackageUsageStateType"
+      vnfmInfo:
+        description: >
+          Match strings that specify VNFMs compatible with the VNF. See Table 9.5.2.5-1.
+        type: array
+        items:
+          type: string
 
 
   PackageChangeType: