SOL002_36 -> 44 & minor changes

src/SOL002/VNFConfiguration/definitions/SOL002VNFConfiguration_def.yaml

@@ -100,6 +100,7 @@ definitions:
       vnfcInstanceId:
         description: >
           Identifier of a VNFC instance to which this set of configuration data applies.
+          The identifier references the "id" attribute in a "VnfcInfo" structure.
         $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf'
       intCpConfig:
         description: >

src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml

@@ -17,8 +17,8 @@ info:
     name: NFV-SOL WG
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V2.7.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.07.01_60/gs_nfv-sol002v020701p.pdf
+  description: ETSI GS NFV-SOL 002 V2.8.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.08.01_60/gs_NFV-SOL002v020801p.pdf
 
 basePath: /vnffm/v1
 
@@ -43,7 +43,7 @@ paths:
   # Alarms                                                                      #
   ###############################################################################
   '/alarms':
-    #SOL003 location: 7.4.2
+    #SOL002 location: 7.4.2
     parameters:
       - name: Version
         description: >
@@ -190,7 +190,7 @@ paths:
   # Individual alarm                                                            #
   ###############################################################################
   '/alarms/{alarmId}':
-    #SOL003 location: 7.4.3
+    #SOL002 location: 7.4.3
     parameters:
       - name: alarmId
         description: >
@@ -474,7 +474,7 @@ paths:
   # Subscriptions                                                               #
   ###############################################################################
   '/subscriptions':
-    #SOL003 location: 7.4.4
+    #SOL002 location: 7.4.5
     parameters:
       - name: Version
         description: >
@@ -667,7 +667,7 @@ paths:
           description: >
             200 OK
 
-            The list of subscriptions has been queried successfully. The response
+            Shall be returned when the list of subscriptions has been queried successfully. The response
             body shall contain the representations of all active
             subscriptions of the functional block that invokes the method.
             If the "filter" URI parameter was supplied in the request, the data 

src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml

@@ -17,8 +17,8 @@ info:
     name: NFV-SOL WG
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V2.7.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.07.01_60/gs_nfv-sol002v020701p.pdf
+  description: ETSI GS NFV-SOL 002 V2.8.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.08.01_60/gs_NFV-SOL002v020801p.pdf
 
 basePath: /callback/v1
 
@@ -112,7 +112,7 @@ paths:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
     get:
       description: >
-        The GET method allows the server to test the notification endpoint
+        The GET method allows the API producer to test the notification endpoint
         that is provided by the client, e.g. during subscription.
       responses:
         204:

src/SOL002/VNFIndicator/VNFIndicator.yaml

@@ -17,8 +17,8 @@ info:
     name: NFV-SOL WG
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V2.7.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.07.01_60/gs_nfv-sol002v020701p.pdf
+  description: ETSI GS NFV-SOL 002 V2.8.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.08.01_60/gs_NFV-SOL002v020801p.pdf
 
 basePath: /vnfind/v1
 
@@ -110,8 +110,8 @@ paths:
 
             Shall be returned when information about zero or more VNF indicators was 
             queried successfully. The response body shall contain in an array the 
-            representations of all VNF indicators that match the attribute-based 
-            filtering parameters, i.e. zero or more representations of VNF indicators 
+            representations of all VNF indicators that match the attribute
+            filter, i.e. zero or more representations of VNF indicators
             as defined in clause 8.5.2.2.
             If the "filter" URI parameter was supplied in the request, the data in 
             the response body shall have been transformed according to the rules 
@@ -741,7 +741,7 @@ paths:
           description: >
             204 NO CONTENT
 
-            Shall be returned when the subscription has been deleted successfully.
+            Shall be returned when the "Individual subscription" has been deleted successfully.
             The response body shall be empty.
           headers:
             Version:

src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml

@@ -17,8 +17,8 @@ info:
     name: NFV-SOL WG
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V2.7.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.07.01_60/gs_nfv-sol002v020701p.pdf
+  description: ETSI GS NFV-SOL 002 V2.8.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.08.01_60/gs_NFV-SOL002v020801p.pdf
 
 schemes:
   - http
@@ -98,7 +98,7 @@ paths:
       description: >
         Service Unavailable
 
-        The GET method allows the server to test the notification endpoint that is provided
+        The GET method allows the API producer to test the notification endpoint that is provided
         by the client, e.g. during subscription.
       responses:
         204:

src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml

 swagger: "2.0"
 
 info:
-  version: "2.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
+  version: "2.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
   title: SOL002 - VNF Perfomance Management interface
   description: >
     SOL002 - VNF Performance Management interface
@@ -17,8 +17,8 @@ info:
     name: NFV-SOL WG
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V2.7.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.07.01_60/gs_nfv-sol002v020701p.pdf
+  description: ETSI GS NFV-SOL 002 V2.8.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.08.01_60/gs_NFV-SOL002v020801p.pdf
 
 basePath: /vnfpm/v2
 
@@ -43,7 +43,7 @@ paths:
   # PM jobs                                                                     #
   ###############################################################################
   '/pm_jobs':
-    #SOL003 location: 6.4.2
+    #SOL002 location: 6.4.2
     parameters:
       - name: Version
         description: >
@@ -640,7 +640,7 @@ paths:
   # Thresholds                                                                  #
   ###############################################################################
   '/thresholds':
-    #SOL003 location: 6.4.5
+    #SOL002 location: 6.4.5
     parameters:
       - name: Version
         description: >
@@ -757,7 +757,7 @@ paths:
           description: >
             Attribute-based filtering expression according to clause 5.2 of ETSI GS NFV-SOL 013.
             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 Thresholds
+            The API consumer may supply this parameter. All attribute names that appear in the Thresholds
             and in data types referenced from it shall be supported by the VNFM in attribute-based filtering expression.
 
             EXAMPLE
@@ -869,7 +869,7 @@ paths:
   # Individual threshold                                                        #
   ###############################################################################
   '/thresholds/{thresholdId}':
-    #SOL003 location: 6.4.6
+    #SOL002 location: 6.4.6
     parameters:
       - name: thresholdId
         description: >

src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml

 swagger: "2.0"
 
 info:
-  version: "2.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
+  version: "2.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
   title: SOL002 - VNF Performance Management Notification interface
   description: >
     SOL002 - VNF Performance Management Notification interface
@@ -17,8 +17,8 @@ info:
     name: NFV-SOL WG
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V2.7.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.07.01_60/gs_nfv-sol002v020701p.pdf
+  description: ETSI GS NFV-SOL 002 V2.8.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.08.01_60/gs_NFV-SOL002v020801p.pdf
 
 basePath: /callback/v1
 
@@ -110,7 +110,7 @@ paths:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
     get:
       description: >
-        The GET method allows the server to test the notification endpoint
+        The GET method allows the API producer to test the notification endpoint
         that is provided by the client, e.g. during subscription.
       parameters:
         - name: Authorization

src/definitions/SOL002SOL003VNFFaultManagement_def.yaml

@@ -91,7 +91,9 @@ definitions:
         $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
       vnfcInstanceIds:
         description: >
-          Identifiers of the affected VNFC instances.
+          Identifiers of the affected VNFC instances. Each identifier references
+          the "id" attribute in a "VnfcInfo" structure. Shall be present if the
+          alarm affects at least one VNFC instance.
         type: array
         items:
           $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"

src/definitions/SOL002SOL003VNFPerformanceManagement_def.yaml

@@ -202,7 +202,7 @@ definitions:
 
   PerformanceReport:
     description: >
-      This type defines the format of a performance report provided by the VNFM to the EM as a result
+      This type defines the format of a performance report provided by the VNFM to the API consumer as a result
       of collecting performance information as part of a PM job.
       The type shall comply with the provisions defined in table 6.5.2.10-1.
     type: object
@@ -305,7 +305,7 @@ definitions:
           string
       objectInstanceIds:
         description: >
-          Identifiers of the VNF instances for which performance information
+          Identifiers of the measured object instances for which performance information
           is collected.
         type: array
         items:
@@ -374,7 +374,7 @@ definitions:
             $ref: "SOL002SOL003_def.yaml#/definitions/Link"
           objects:
             description: >
-              Links to resources representing the measure
+              Links to resources representing the measured
               object instances for which performance
               information is collected. Shall be present if the
               measured object instance information is