Merge branch '2.6.1-dev' into 'master'

2.6.1 dev

See merge request !13

src/SOL005/NSDManagement/definitions/SOL005NSDescriptorManagement_def.yaml

@@ -309,6 +309,12 @@ definitions:
       to match (logical "and" between different filter attributes). 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).
+
+      NOTE 1: The attributes "nsdId" and "nsdInfoId" are alternatives to reference to a particular NSD in a filter.
+      They should not be used both in the same filter instance, but one alternative should be chosen.
+
+      NOTE 2: The attributes "pnfdId" and "pnfdInfoId" are alternatives to reference to a particular PNFD in a filter.
+      They should not be used both in the same filter instance, but one alternative should be chosen.
     properties:
       notificationTypes:
         description: >

src/SOL005/definitions/SOL005_def.yaml

@@ -158,6 +158,15 @@ definitions:
   NsInstanceSubscriptionFilter:
     description: >
       This type represents subscription filter criteria to match NS instances.
+
+      NOTE 1: The attributes "nsdIds", "vnfdIds" and "pnfdIds" are alternatives to reference to NS instances that are
+      created based on certain NSDs, or contain VNF instances that are based on certain VNFDs, or contain
+      PNFs that are based on certain PNFDs in a filter. They should not be used together in the same filter
+      instance, but one alternative should be chosen.
+      
+      NOTE 2: The attributes "nsInstanceIds" and "nsInstanceNames" are alternatives to reference to particular NS
+      Instances in a filter. They should not be used both in the same filter instance, but one alternative should be
+      chosen.
     type: object
     properties:
       nsdIds: