Merge branch 'v2.4.1-editorial-fixes' into 'master'

SOL002/SOL003: OpenAPI version updated to 1.1.0 + Notification interfaces added

See merge request !3

src/SOL002/VNFConfiguration/VNFConfiguration.yaml

 swagger: "2.0"
 
 info: 
-  version: "1.1.1"
+  version: "1.1.0"
   title: SOL002 - VNF Configuration interface
   description: >
     VNF Configuration interface of ETSI NFV SOL002

src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml

 swagger: "2.0"
 
 info: 
-  version: "1.1.1"
-  title: DRAFT - SOL002 - VNF Fault Management interface
+  version: "1.1.0"
+  title: SOL002 - VNF Fault Management interface
   description: >
     DRAFT VNF Fault Management interface of ETSI NFV SOL002
 
@@ -589,5 +589,4 @@ paths:
         500:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
         503:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
-
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
\ No newline at end of file

src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml

+swagger: "2.0"
+
+info:
+  version: "1.1.0"
+  title: SOL002 - VNF Fault Management Notification interface
+  description: >
+    SOL002 - VNF Fault Management Notification interface
+
+
+    IMPORTANT: Please note that this file might be not aligned to the current
+    version of the ETSI Group Specification it refers to. In case of
+    discrepancies the published ETSI Group Specification takes precedence.
+
+
+    In clause 4.3.2 of ETSI GS NFV-SOL 002 v2.4.1, an attribute-based
+    filtering mechanism is defined. This mechanism is currently not
+    included in the corresponding OpenAPI design for this GS version. Changes
+    to the attribute-based filtering mechanism are being considered in v2.5.1
+    of this GS for inclusion in the corresponding future ETSI NFV OpenAPI
+    design.
+
+    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=
+  license:
+    name: "ETSI Forge copyright notice"
+    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
+
+externalDocs:
+  description: ETSI GS NFV-SOL 002 V2.4.1
+  url: http://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.04.01_60/gs_NFV-SOL002v020401p.pdf
+
+basePath: "/callback/v1"
+
+schemes:
+  - https
+
+consumes:
+  - "application/json"
+produces:
+  - "application/json"
+
+paths:
+  ###############################################################################
+  # Notification endpoint AlarmNotification                                     #
+  ###############################################################################
+  '/URI-is-provided-by-the-client-when-creating-the-subscription-AlarmNotification':
+    post:
+      description: >
+        Notify
+
+
+        The POST method notifies a VNF alarm or that the alarm list has been
+        rebuilt.
+      parameters:
+        - name: AlarmNotification
+          description: >
+            Information of a VNF alarm.
+          in: body
+          required: true
+          schema:
+            $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/AlarmNotification"
+        - name: Authorization
+          description: >
+            The authorization token for the request.
+            Reference: IETF RFC 7235
+          in: header
+          required: false
+          type: string
+        - name: Content-Type
+          description: >
+            The Content-Type header shall be set to
+            "application/merge-patch+json" according to
+            IETF RFC 7396.
+          in: header
+          required: true
+          type: string
+        - name: Version
+          description: >
+            Version of the API requested to use when responding to this request.
+          in: header
+          required: true
+          type: string
+      responses:
+        204:
+          description: >
+            No Content
+
+            The notification was delivered successfully.
+            The response body shall be empty.
+          headers:
+            WWW-Authenticate:
+              description: >
+                Challenge if the corresponding HTTP request has not provided
+                authorization, or error details if the corresponding HTTP
+                request has provided an invalid authorization token.
+              type: string
+              maximum: 1
+              minimum: 0
+            Version:
+              description: >
+                Version of the API used in the response.
+              type: string
+              maximum: 1
+              minimum: 1
+        400:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"
+        401:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/401"
+        403:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/403"
+        405:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/405"
+        406:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406"
+        500:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
+        503:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
+    get:
+      description: >
+        The GET method allows the server to test the notification endpoint
+        that is provided by the client, e.g. during subscription.
+      parameters:
+        - name: Authorization
+          description: >
+            The authorization token for the request.
+            Reference: IETF RFC 7235
+          in: header
+          required: false
+          type: string
+        - name: Version
+          description: >
+            Version of the API requested to use when responding to this request.
+          in: header
+          required: true
+          type: string
+      responses:
+        204:
+          description: >
+            No Content
+
+            The notification endpoint was tested successfully.
+            The response body shall be empty.
+          headers:
+            WWW-Authenticate:
+              description: >
+                Challenge if the corresponding HTTP request has not provided
+                authorization, or error details if the corresponding HTTP
+                request has provided an invalid authorization token.
+              type: string
+              maximum: 1
+              minimum: 0
+            Version:
+              description: >
+                Version of the API used in the response.
+              type: string
+              maximum: 1
+              minimum: 1
+        400:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"
+        401:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/401"
+        403:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/403"
+        405:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/405"
+        406:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406"
+        500:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
+        503:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
+  ###############################################################################
+  # Notification endpoint AlarmClearedNotification                              #
+  ###############################################################################
+  '/URI-is-provided-by-the-client-when-creating-the-subscription-AlarmClearedNotification':
+    post:
+      description: >
+        Notify
+
+
+        The POST method notifies a VNF alarm or that the alarm list has been
+        rebuilt.
+      parameters:
+        - name: AlarmClearedNotification
+          description: >
+            Information of the clearance of a VNF alarm
+          in: body
+          required: true
+          schema:
+            $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/AlarmClearedNotification"
+        - name: Authorization
+          description: >
+            The authorization token for the request.
+            Reference: IETF RFC 7235
+          in: header
+          required: false
+          type: string
+        - name: Content-Type
+          description: >
+            The Content-Type header shall be set to
+            "application/merge-patch+json" according to
+            IETF RFC 7396.
+          in: header
+          required: true
+          type: string
+        - name: Version
+          description: >
+            Version of the API requested to use when responding to this request.
+          in: header
+          required: true
+          type: string
+      responses:
+        204:
+          description: >
+            No Content
+
+            The notification was delivered successfully.
+            The response body shall be empty.
+          headers:
+            WWW-Authenticate:
+              description: >
+                Challenge if the corresponding HTTP request has not provided
+                authorization, or error details if the corresponding HTTP
+                request has provided an invalid authorization token.
+              type: string
+              maximum: 1
+              minimum: 0
+            Version:
+              description: >
+                Version of the API used in the response.
+              type: string
+              maximum: 1
+              minimum: 1
+        400:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"
+        401:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/401"
+        403:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/403"
+        405:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/405"
+        406:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406"
+        500:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
+        503:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
+    get:
+      description: >
+        The GET method allows the server to test the notification endpoint
+        that is provided by the client, e.g. during subscription.
+      parameters:
+        - name: Authorization
+          description: >
+            The authorization token for the request.
+            Reference: IETF RFC 7235
+          in: header
+          required: false
+          type: string
+        - name: Version
+          description: >
+            Version of the API requested to use when responding to this request.
+          in: header
+          required: true
+          type: string
+      responses:
+        204:
+          description: >
+            No Content
+
+            The notification endpoint was tested successfully.
+            The response body shall be empty.
+          headers:
+            WWW-Authenticate:
+              description: >
+                Challenge if the corresponding HTTP request has not provided
+                authorization, or error details if the corresponding HTTP
+                request has provided an invalid authorization token.
+              type: string
+              maximum: 1
+              minimum: 0
+            Version:
+              description: >
+                Version of the API used in the response.
+              type: string
+              maximum: 1
+              minimum: 1
+        400:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"
+        401:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/401"
+        403:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/403"
+        405:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/405"
+        406:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406"
+        500:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
+        503:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
+  ###############################################################################
+  # Notification endpoint AlarmListRebuiltNotification                          #
+  ###############################################################################
+  '/URI-is-provided-by-the-client-when-creating-the-subscription-AlarmListRebuiltNotification':
+    post:
+      description: >
+        Notify
+
+
+        The POST method notifies a VNF alarm or that the alarm list has been
+        rebuilt.
+      parameters:
+        - name: AlarmListRebuiltNotification
+          description: >
+            Information that the alarm list has been rebuilt by the VNFM
+          in: body
+          required: true
+          schema:
+            $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/AlarmListRebuiltNotification"
+        - name: Authorization
+          description: >
+            The authorization token for the request.
+            Reference: IETF RFC 7235
+          in: header
+          required: false
+          type: string
+        - name: Content-Type
+          description: >
+            The Content-Type header shall be set to
+            "application/merge-patch+json" according to
+            IETF RFC 7396.
+          in: header
+          required: true
+          type: string
+        - name: Version
+          description: >
+            Version of the API requested to use when responding to this request.
+          in: header
+          required: true
+          type: string
+      responses:
+        204:
+          description: >
+            No Content
+
+            The notification was delivered successfully.
+            The response body shall be empty.
+          headers:
+            WWW-Authenticate:
+              description: >
+                Challenge if the corresponding HTTP request has not provided
+                authorization, or error details if the corresponding HTTP
+                request has provided an invalid authorization token.
+              type: string
+              maximum: 1
+              minimum: 0
+            Version:
+              description: >
+                Version of the API used in the response.
+              type: string
+              maximum: 1
+              minimum: 1
+        400:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"
+        401:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/401"
+        403:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/403"
+        405:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/405"
+        406:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406"
+        500:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
+        503:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
+    get:
+      description: >
+        The GET method allows the server to test the notification endpoint
+        that is provided by the client, e.g. during subscription.
+      parameters:
+        - name: Authorization
+          description: >
+            The authorization token for the request.
+            Reference: IETF RFC 7235
+          in: header
+          required: false
+          type: string
+        - name: Version
+          description: >
+            Version of the API requested to use when responding to this request.
+          in: header
+          required: true
+          type: string
+      responses:
+        204:
+          description: >
+            No Content
+
+            The notification endpoint was tested successfully.
+            The response body shall be empty.
+          headers:
+            WWW-Authenticate:
+              description: >
+                Challenge if the corresponding HTTP request has not provided
+                authorization, or error details if the corresponding HTTP
+                request has provided an invalid authorization token.
+              type: string
+              maximum: 1
+              minimum: 0
+            Version:
+              description: >
+                Version of the API used in the response.
+              type: string
+              maximum: 1
+              minimum: 1
+        400:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"
+        401:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/401"
+        403:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/403"
+        405:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/405"
+        406:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406"
+        500:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
+        503:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"

src/SOL002/VNFIndicator/VNFIndicator.yaml

@@ -2,8 +2,8 @@
 swagger: "2.0"
 
 info: 
-  version: "1.1.1"
-  title: DRAFT - SOL002 - VNF Indicator interface
+  version: "1.1.0"
+  title: SOL002 - VNF Indicator interface
   description: >
     DRAFT VNF Indicator interface of ETSI NFV SOL002.
     
@@ -480,6 +480,4 @@ paths:
           416: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/416' }
           422: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/422' }
           500: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/500' }
-          503: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/503' }
-
-
+          503: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/503' }
\ No newline at end of file

src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml

 swagger: "2.0"
 
 info: 
-  version: "1.1.1"
+  version: "1.1.0"
   title: "SOL002 - VNF Indicator Notification Endpoint interface"
   description: >
     VNF Indicator Notification Endpoint interface of ETSI NFV SOL002
@@ -92,8 +92,4 @@ paths:
           416: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/416' }
           422: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/422' }
           500: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/500' }
-          503: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/503' }
-
-
-
-
+          503: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/503' }
\ No newline at end of file

src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml

 swagger: "2.0"
 
 info: 
-  version: "1.1.1"
+  version: "1.1.0"
   title: "SOL002 - VNF Configuration interface"
   description: >
     VNF Configuration interface of ETSI NFV SOL002
@@ -1293,4 +1293,4 @@ paths:
         500:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
         503:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
\ No newline at end of file

src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml

+swagger: "2.0"
+
+info:
+  version: "1.1.0"
+  title: SOL002 - VNF Lifecycle Management Notification interface
+  description: >
+    SOL002 - VNF Lifecycle Management Notification interface
+
+
+    IMPORTANT: Please note that this file might be not aligned to the current
+    version of the ETSI Group Specification it refers to. In case of
+    discrepancies the published ETSI Group Specification takes precedence.
+
+
+    In clause 4.3.2 of ETSI GS NFV-SOL 002 v2.4.1, an attribute-based
+    filtering mechanism is defined. This mechanism is currently not
+    included in the corresponding OpenAPI design for this GS version. Changes
+    to the attribute-based filtering mechanism are being considered in v2.5.1
+    of this GS for inclusion in the corresponding future ETSI NFV OpenAPI
+    design.
+
+    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=
+  license:
+    name: "ETSI Forge copyright notice"
+    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
+
+externalDocs:
+  description: ETSI GS NFV-SOL 002 V2.4.1
+  url: http://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.04.01_60/gs_NFV-SOL002v020401p.pdf
+
+basePath: "/callback/v1"
+
+schemes:
+  - https
+
+consumes:
+  - "application/json"
+produces:
+  - "application/json"
+
+paths:
+  ###############################################################################
+  # Notification endpoint VnfLcmOperationOccurrenceNotification                 #
+  ###############################################################################
+  '/URI-is-provided-by-the-client-when-creating-the-subscription-VnfLcmOperationOccurrenceNotification':
+    post:
+      description: >
+        Notify
+
+
+        The POST method delivers a notification from the server to the client.
+      parameters:
+        - name: VnfLcmOperationOccurrenceNotification
+          description: A notification about on-boarding of a VNF package.
+          in: body
+          required: true
+          schema:
+            $ref: "definitions/VNFLifecycleManagementNotification_def.yaml#/definitions/VnfLcmOperationOccurrenceNotification"
+        - name: Authorization
+          description: >
+            The authorization token for the request.
+            Reference: IETF RFC 7235
+          in: header
+          required: false
+          type: string
+        - name: Content-Type
+          description: >
+            The MIME type of the body of the request.
+            Reference: IETF RFC 7231
+          in: header
+          required: true
+          type: string