SOL002 overall consolidation

src/SOL002/APIVersion/APIVersion.yaml

 swagger: "2.0"
+
 info:
   version: "1.2.0"
-  title: "SOL002 - API version interface"
+  title: SOL002 - API version interface
   description: >
     SOL002 - API version Interface
     IMPORTANT: Please note that this file might be not aligned to the current
@@ -10,20 +11,25 @@ info:
     Group Specification takes precedence.
     Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
   license:
-    name: "ETSI Forge copyright notice"
+    name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
   contact:
-    name: "NFV-SOL WG"
+    name: NFV-SOL WG
+
 externalDocs:
   description: ETSI GS NFV-SOL 002 V2.5.1
   url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.05.01_60/gs_nfv-sol002v020501p.pdf
+
 schemes:
   - http
   - https
+
 consumes:
   - application/json
+
 produces:
   - application/json
+
 paths:
   ###############################################################################
   # API Versions                                                                #

src/SOL002/VNFConfiguration/VNFConfiguration.yaml

 swagger: "2.0"
+
 info:
   version: "1.2.0"
-  title: "SOL002 - VNF Configuration interface"
+  title: SOL002 - VNF Configuration interface
   description: >
     SOL002 - VNF Configuration Interface
     IMPORTANT: Please note that this file might be not aligned to the current
@@ -10,10 +11,10 @@ info:
     Group Specification takes precedence.
     Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
   license:
-    name: "ETSI Forge copyright notice"
+    name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
   contact:
-    name: "NFV-SOL WG"
+    name: NFV-SOL WG
 
 externalDocs:
   description: ETSI GS NFV-SOL 002 V2.5.1
@@ -24,10 +25,10 @@ basePath: /vnfconfig/v1
 schemes:
   - http
   - https
-  -
+
 consumes:
   - application/json
-  -
+
 produces:
   - application/json
 

src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml

@@ -4,16 +4,17 @@ info:
   version: "1.2.0"
   title: SOL002 - VNF Fault Management interface
   description: >
-    VNF Fault Management interface of ETSI NFV SOL002
-
+    SOL002 - VNF Fault Management 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.
-
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=---
+    version of the ETSI Group Specification it refers to and has not been
+    approved by the ETSI NFV ISG. In case of discrepancies the published ETSI
+    Group Specification takes precedence.
+    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
   license:
-    name: "ETSI Forge copyright notice"
+    name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
+  contact:
+    name: NFV-SOL WG
 
 externalDocs:
   description: ETSI GS NFV-SOL 002 V2.5.1

src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml

@@ -5,38 +5,32 @@ info:
   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=
+    version of the ETSI Group Specification it refers to and has not been
+    approved by the ETSI NFV ISG. In case of discrepancies the published ETSI
+    Group Specification takes precedence.
+    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
   license:
-    name: "ETSI Forge copyright notice"
+    name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
+  contact:
+    name: NFV-SOL WG
 
 externalDocs:
   description: ETSI GS NFV-SOL 002 V2.5.1
   url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.05.01_60/gs_nfv-sol002v020501p.pdf
 
-basePath: "/callback/v1"
+basePath: /callback/v1
 
 schemes:
+  - http
   - https
 
 consumes:
-  - "application/json"
+  - application/json
+
 produces:
-  - "application/json"
+  - application/json
 
 paths:
 ###############################################################################

src/SOL002/VNFIndicator/VNFIndicator.yaml

@@ -2,21 +2,19 @@ swagger: "2.0"
 
 info:
   version: "1.2.0"
-  title: "SOL002 - VNF Indicator interface"
+  title: SOL002 - VNF Indicator interface
   description: >
-    VNF Indicator interface of ETSI NFV SOL002.
-
-    This API allows the EM/VNF to provide information on value changes of VNF related indicators. 
-    VNF related indicators are declared in the VNFD.
-
+    SOL002 - VNF Indicator 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.
-
+    version of the ETSI Group Specification it refers to and has not been
+    approved by the ETSI NFV ISG. In case of discrepancies the published ETSI
+    Group Specification takes precedence.
     Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
   license:
-    name: "ETSI Forge copyright notice"
+    name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
+  contact:
+    name: NFV-SOL WG
 
 externalDocs:
   description: ETSI GS NFV-SOL 002 V2.5.1

src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml

@@ -2,21 +2,19 @@ swagger: "2.0"
 
 info: 
   version: "1.2.0"
-  title: "SOL002 - VNF Indicator Notification Endpoint interface"
+  title: SOL002 - VNF Indicator Notification Endpoint interface
   description: >
-    VNF Indicator Notification Endpoint interface of ETSI NFV SOL002
-
-
+    SOL002 - VNF Indicator Notification Endpoint 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.
-
-
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=---
-  
+    version of the ETSI Group Specification it refers to and has not been
+    approved by the ETSI NFV ISG. In case of discrepancies the published ETSI
+    Group Specification takes precedence.
+    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
   license:
-    name: "ETSI Forge copyright notice"
+    name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
+  contact:
+    name: NFV-SOL WG
 
 externalDocs:
   description: ETSI GS NFV-SOL 002 V2.5.1
@@ -32,9 +30,7 @@ consumes:
 produces: 
   - application/json
 
-
 paths:
-
     /notificationendpoint:
       parameters:
         - name: Version
@@ -111,8 +107,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

@@ -2,21 +2,22 @@ swagger: "2.0"
 
 info: 
   version: "1.2.0"
-  title: "SOL002 - VNF Lifecycle Management Interface"
+  title: SOL002 - VNF Lifecycle Management interface
   description: >
-    VNF Lifecycle Management Interface of ETSI NFV SOL002
-
+    SOL002 - VNF Lifecycle Management 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.
-
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=---
+    version of the ETSI Group Specification it refers to and has not been
+    approved by the ETSI NFV ISG. In case of discrepancies the published ETSI
+    Group Specification takes precedence.
+    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
   license:
-    name: "ETSI Forge copyright notice"
+    name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
+  contact:
+    name: NFV-SOL WG
 
 externalDocs:
-  description: "ETSI GS NFV-SOL 002 V2.5.1"
+  description: ETSI GS NFV-SOL 002 V2.5.1
   url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.05.01_60/gs_nfv-sol002v020501p.pdf
 
 basePath: /vnflcm/v1

src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml

@@ -5,43 +5,37 @@ info:
   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=
+    version of the ETSI Group Specification it refers to and has not been
+    approved by the ETSI NFV ISG. In case of discrepancies the published ETSI
+    Group Specification takes precedence.
+    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
   license:
-    name: "ETSI Forge copyright notice"
+    name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
+  contact:
+    name: NFV-SOL WG
 
 externalDocs:
   description: ETSI GS NFV-SOL 002 V2.5.1
   url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.05.01_60/gs_nfv-sol002v020501p.pdf
 
-basePath: "/callback/v1"
+basePath: /callback/v1
 
 schemes:
+  - http
   - https
 
 consumes:
-  - "application/json"
+  - application/json
+
 produces:
-  - "application/json"
+  - application/json
 
 paths:
-###############################################################################
-# Notification endpoint VnfLcmOperationOccurrenceNotification                      #
-###############################################################################
+  ###############################################################################
+  # Notification endpoint VnfLcmOperationOccurrenceNotification                 #
+  ###############################################################################
   '/URI-is-provided-by-the-client-when-creating-the-subscription-VnfLcmOperationOccurrenceNotification':
     post:
       description: >
@@ -264,4 +258,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/VNFPerformanceManagement/VNFPerformanceManagement.yaml

@@ -2,18 +2,19 @@ swagger: "2.0"
 
 info: 
   version: "1.2.0"
-  title: "SOL002 - VNF Configuration interface"
+  title: SOL002 - VNF Perfomance Management interface
   description: >
-    VNF Configuration interface of ETSI NFV SOL002
-
+    SOL002 - VNF Performance Management 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.
-
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=---
+    version of the ETSI Group Specification it refers to and has not been
+    approved by the ETSI NFV ISG. In case of discrepancies the published ETSI
+    Group Specification takes precedence.
+    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
   license:
-    name: "ETSI Forge copyright notice"
+    name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
+  contact:
+    name: NFV-SOL WG
 
 externalDocs:
   description: ETSI GS NFV-SOL 002 V2.5.1

src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml

@@ -5,24 +5,16 @@ info:
   title: SOL002 - VNF Performance Management Notification interface
   description: >
     SOL002 - VNF Performance 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=
+    version of the ETSI Group Specification it refers to and has not been
+    approved by the ETSI NFV ISG. In case of discrepancies the published ETSI
+    Group Specification takes precedence.
+    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
   license:
-    name: "ETSI Forge copyright notice"
+    name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
+  contact:
+    name: NFV-SOL WG
 
 externalDocs:
   description: ETSI GS NFV-SOL 002 V2.5.1
@@ -31,10 +23,12 @@ externalDocs:
 basePath: /callback/v1
 
 schemes:
+  - http
   - https
 
 consumes:
   - application/json
+
 produces:
   - application/json