Commit a7dd7d90 authored by moscatelli's avatar moscatelli
Browse files

SOL002_65: filters implemented in Subscriptions GET

parent 43980361
Loading
Loading
Loading
Loading
Loading
+85 −161
Original line number Original line Diff line number Diff line
@@ -130,6 +130,11 @@ paths:
           of that response.
           of that response.
         type: string
         type: string
         required: true
         required: true
      get:
        summary: Query multiple indicators related to a VNF instance.
        description: >
           Get a list of indicators related to a specific VNF instance. Support of attribute based filtering via query parameters.
        parameters:
          - name: filter
          - name: filter
            description: >
            description: >
              Attribute-based filtering expression according to clause 4.3.2.
              Attribute-based filtering expression according to clause 4.3.2.
@@ -171,59 +176,6 @@ paths:
            in: query
            in: query
            required: false
            required: false
            type: string
            type: string
      get:
        summary: Query multiple indicators related to a VNF instance.
        description: >
           Get a list of indicators related to a specific VNF instance. Support of attribute based filtering via query parameters.
#        parameters:
#         - name: id.eq
#           in: query
#           description: Attribute based filtering for indicator identifer as specified in VNFD.
#           type: array
#           items:
#             type: string
#         - name: name.eq
#           in: query
#           description: Attribute based filtering for indicator name as specified in VNFD.
#           type: array
#           items:
#             type: string
#         - name: value.eq
#           in: query
#           description: Attribute based filtering for indicator value equality.
#           type: array
#           items:
#             type: string
#         - name: value.neq
#           in: query
#           description: Attribute based filtering for indicator value unequality.
#           type: array
#           items:
#             type: string
#         - name: value.gt
#           in: query
#           description: Attribute based filtering for indicator value greater than.
#           type: array
#           items:
#             type: string
#         - name: value.gte
#           in: query
#           description: Attribute based filtering for indicator value greater then or equal.
#           type: array
#           items:
#             type: string
#         - name: value.lt
#           in: query
#           description: Attribute based filtering for indicator value less than.
#           type: array
#           items:
#             type: string
#         - name: value.lte
#           in: query
#           description: Attribute based filtering for indicator value less than or equal.
#           type: array
#           items:
#             type: string
        responses:
        responses:
          200:
          200:
            description: >
            description: >
@@ -379,77 +331,49 @@ paths:


          The GET method queries the list of active subscriptions of the functional block
          The GET method queries the list of active subscriptions of the functional block
          that invokes the method. It can be used e.g. for resynchronization after error situations.
          that invokes the method. It can be used e.g. for resynchronization after error situations.
#        parameters:
        parameters:
#         - name: id.eq
          - name: filter
#           in: query
            description: >
#           description: >
              Attribute-based filtering expression according to clause 4.3.2.
#             Attribute based filtering for subscription identifiers.
              The EM shall and the VNF may support receiving this parameter as part
#           type: array
              of the URI query string. The VNFM may supply this parameter.
#           items:
              All attribute names that appear in the VnfIndicatorSubscription data
#             type: string
              type and in data types referenced from it shall be supported in the filter expression.
#         - name: callbackUri.eq
              If receiving, this parameter is not supported, a 400 Bad Request response shall
#           in: query
              be returned (see table 8.4.5.3.2-2).
#           description: >

#             Attribute based filtering for the subscription's call back URIs.
              EXAMPLE
#           type: array
              objects
#           items:
              obj1: {"id":123, "weight":100, "parts":[{"id":1, "color":"red"}, {"id":2, "color":"green"}]}
#             type: string
              obj2: {"id":456, "weight":500, "parts":[{"id":3, "color":"green"}, {"id":4, "color":"blue"}]}
#         - name: filter.indicatorIds.cont

#           in: query
              Request 1:
#           description: >
              GET …/container
#             Attribute based filtering for indicator identifiers.

#           type: array
              Response 1:
#           items:
              [
#             type: string
                  {"id":123, "weight":100, "parts":[{"id":1, "color":"red"}, {"id":2, "color":"green"}]},
#         - name: filter.vnfInstanceSubscriptionFilter.vnfdIds.cont
                  {"id":456, "weight":500, "parts":[{"id":3, "color":"green"}, {"id":4, "color":"blue"}]}
#           in: query
              ]
#           description: >

#             Attribute based filtering for VNFD identifiers.
              Request 2:
#           type: array
              GET …/container?filter=(eq.weight,100)
#           items:

#             type: string
              Response 2:
#         - name: filter.vnfInstanceSubscriptionFilter.vnfProductsFromProviders.vnfProvider.eq
              [
#           in: query
                  {"id":123, "weight":100, "parts":[{"id":1, "color":"red"}, {"id":2, "color":"green"}]}
#           description: >
              ]
#             Attribute based filtering for VNF providers.
            #Request 2 in EXAMPLE from clause 4.3.2 probably wrong, since "," should be used after opOne (eq), "." is used
#           type: array
            in: query
#           items:
            required: false
#             type: string
            type: string
#         - name: filter.vnfInstanceSubscriptionFilter.vnfProductsFromProviders.vnfProducts.vnfProductName.eq
          - name: nextpage_opaque_marker
#           in: query
            description: >
#           description: >
              Marker to obtain the next page of a paged response. Shall be supported by the EM
#             Attribute based filtering for VNF product name.
              if the EM supports alternative 2 (paging) according to clause 4.7.2.1 for this resource.
#           type: array
            in: query
#           items:
            required: false
#             type: string
            type: string
#         - name: filter.vnfInstanceSubscriptionFilter.vnfProductsFromProviders.vnfProducts.versions.vnfSoftwareVersion.cont
#           in: query
#           description: >
#             Attribute based filtering for VNF software versions.
#           type: array
#           items:
#             type: string
#         - name: filter.vnfInstanceSubscriptionFilter.vnfProductsFromProviders.vnfProducts.versions.vnfdVersion.cont
#           in: query
#           description: >
#             Attribute based filtering for VNFD versions.
#           type: array
#           items:
#             type: string
#         - name: filter.vnfInstanceSubscriptionFilter.vnfInstanceIds.cont
#           in: query
#           description: >
#             Attribute based filtering for VNF instance identifiers.
#           type: array
#           items:
#             type: string
#         - name: filter.vnfInstanceSubscriptionFilter.vnfInstanceNames.cont
#           in: query
#           description: >
#             Attribute based filtering for VNF instance names.
#           type: array
#           items:
#             type: string
        responses:
        responses:
          200:
          200:
            description: >
            description: >