From abfc5108c94f04ea3efaa4c9aa4941765b7268d4 Mon Sep 17 00:00:00 2001
From: moscatelli <moscatelli@etsi.org>
Date: Fri, 15 Mar 2019 12:03:49 +0100
Subject: [PATCH] SOL002_56: filters implemented in Alarms GET

---
 .../VNFFaultManagement.yaml                   | 43 +++++++++++++++++++
 .../VNFPerformanceManagement.yaml             |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml
index 9c18c3e0..dc857917 100644
--- a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml
+++ b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml
@@ -67,6 +67,49 @@ paths:
           in: header
           required: true
           type: string
+        - name: filter
+          description: >
+            Attribute-based filtering expression according to clause 4.3.2.
+            The VNFM shall support receiving this parameter as part of the URI query string.
+            The EM may supply this parameter. The VNF may supply its instance Id as an attribute filter.
+            The following attribute names shall be supported in the filter expression: id, managedObjectId,
+            vnfcInstanceIds, rootCauseFaultyResource.faultyResourceType, eventType, perceivedSeverity, probableCause.
+            If the vnfcInstanceIds parameter is provided, exactly one value for the managedObjectId attribute
+            shall be provided.
+
+            EXAMPLE
+            objects
+            obj1: {"id":123, "weight":100, "parts":[{"id":1, "color":"red"}, {"id":2, "color":"green"}]}
+            obj2: {"id":456, "weight":500, "parts":[{"id":3, "color":"green"}, {"id":4, "color":"blue"}]}
+
+            Request 1:
+            GET …/container
+
+            Response 1:
+            [
+                {"id":123, "weight":100, "parts":[{"id":1, "color":"red"}, {"id":2, "color":"green"}]},
+                {"id":456, "weight":500, "parts":[{"id":3, "color":"green"}, {"id":4, "color":"blue"}]}
+            ]
+
+            Request 2:
+            GET …/container?filter=(eq.weight,100)
+
+            Response 2:
+            [
+                {"id":123, "weight":100, "parts":[{"id":1, "color":"red"}, {"id":2, "color":"green"}]}
+            ]
+          #Request 2 in EXAMPLE from clause 4.3.2 probably wrong, since "," should be used after opOne (eq), "." is used
+          in: query
+          required: false
+          type: string
+        - name: nextpage_opaque_marker
+          description: >
+            Marker to obtain the next page of a paged response.
+            Shall be supported by the VNFM if the VNFM supports alternative 2
+            (paging) according to clause 4.7.2.1 for this resource.
+          in: query
+          required: false
+          type: string
       responses:
         200:
           description: > 
diff --git a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml
index c49db009..5491a6c8 100644
--- a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml
+++ b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml
@@ -813,7 +813,7 @@ paths:
           description: >
             Attribute-based filtering expression according to clause 4.3.2.
             The VNFM shall support receiving this parameter as part of the URI query string.
-            The EM may supply this parameter. All attribute names that appear in the PmSubscription 
+            The EM may supply this parameter. All attribute names that appear in the PmSubscription
             and in data types referenced from it shall be supported by the VNFM in attribute-based filtering expression.
 
             EXAMPLE
-- 
GitLab