Merge Request issue.

Re committing NSPM files.

src/SOL005/NSPerformanceManagement/definitions/NSPerfomananceManagement_def.yaml

 definitions:
   PerformanceReport:
     description: >
-      This type defines the format of a performance report provided by the
-      VNFM to the NFVO as a result of collecting performance information as
-      part of a PM job.
+      This type defines the format of a performance report provided by the NFVO 
+      to the OSS/BSS as a result of collecting
+      performance information as part of a PM job. 
+      The type shall comply with the provisions defined in Table 7.5.2.10-1.
     type: object
     required:
       - entries
     properties:
       entries:
         description: >
-          List of performance information entries. Each performance report
-          entry is for a given metric of a given object (i.e. VNF instance),
-          but can include multiple collected values.
+          List of performance information entries. Each
+          performance report entry is for a given metric of a given
+          object (i.e. NS instance), but can include multiple
+          collected values.
         type: array
         items:
           type: object
@@ -24,15 +26,17 @@ definitions:
           properties: 
             objectType:
               description: >
-                Defines the object type for which performance information is
-                reported (i.e. VNF type). The string value shall be set to the
-                vnfdId of the VNF instance to which the performance
-                information relates.
+                Defines the object type for which performance
+                information is reported (i.e. NS type). The string value
+                shall be set to the nsdId of the NS instance to which the
+                performance information relates.
               type: string
             objectInstanceId: 
               description: >
-                The object instance (i.e. VNF instance) for which the
-                performance metric is reported.
+                The object instance for which the performance metric is
+                reported.
+                The object instances for this information element will be
+                NS instances.
               $ref: "SOL005_def.yaml#/definitions/Identifier"
             performanceMetric:
               description: >
@@ -54,10 +58,6 @@ definitions:
                     $ref: "SOL005_def.yaml#/definitions/DateTime"
                   value:
                     description: >
-                      Value of the metric collected.
-                      The type of the "value" attribute (i.e. scalar,
-                      structure (Object in JSON), or array (of scalars, arrays
-                      or structures / Objects)) is assumed to be defined in
-                      the external measurement specification
-                      (see ETSI GS NFV-IFA 027).
+                      The type of the "performanceValue" attribute (i.e. scalar, structure (Object in JSON), or array (of scalars,
+                      arrays or structures / Objects)) is outside the scope of the present document.
                     type: object
\ No newline at end of file

src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerfomananceManagement_def.yaml

@@ -298,8 +298,8 @@ definitions:
         description: >
           Match particular notification types.
           Permitted values:
-          * ThresholdCrossedNotification
-          * PerformanceInformationAvailableNotification
+          - ThresholdCrossedNotification
+          - PerformanceInformationAvailableNotification
           The permitted values of the "notificationTypes" attribute are
           spelled exactly as the names of the notification types to facilitate
           automated code generation systems.          
@@ -384,6 +384,7 @@ definitions:
       - notificationType
       - subscriptionId
       - timeStamp
+      - objectInstanceId
       - _links
     properties:
       id:
@@ -440,8 +441,11 @@ definitions:
           performanceReport:
             description: >
               Link from which the available performance
-              information of data type "PerformanceReport" can be obtained.
-              This link should point to an "Individual performance report" resource.
+              information of data type "PerformanceReport"
+              (see clause 7.5.2.10) can be obtained.
+              This link should point to an "Individual
+              performance report" resource as defined in
+              clause 6.4.3a.
             $ref: "SOL005_def.yaml#/definitions/Link"
 
   ThresholdCrossedNotification:

src/SOL005/NSPerformanceManagement/definitions/SOL005_def.yaml

@@ -164,12 +164,12 @@
            Defines the types of Authentication / Authorization which the API
            consumer is willing to accept when receiving a notification.
            Permitted values:
-           * BASIC: In every HTTP request to the notification endpoint, use
+           - BASIC: In every HTTP request to the notification endpoint, use
              HTTP Basic authentication with the client credentials. 
-           * OAUTH2_CLIENT_CREDENTIALS: In every HTTP request to the
+           - OAUTH2_CLIENT_CREDENTIALS: In every HTTP request to the
              notification endpoint, use an OAuth 2.0 Bearer token, obtained
              using the client credentials grant type.
-           * TLS_CERT: Every HTTP request to the notification endpoint is sent
+           - TLS_CERT: Every HTTP request to the notification endpoint is sent
              over a mutually authenticated TLS session, i.e. not only the
              server is authenticated, but also the client is authenticated
              during the TLS tunnel setup.
@@ -233,4 +233,4 @@
              description: >
                The token endpoint from which the access token can be obtained.
                Shall be present if it has not been provisioned out of band.
-             $ref: "#/definitions/Uri" 
\ No newline at end of file
+             $ref: "#/definitions/Uri"
\ No newline at end of file

src/SOL005/NSPerformanceManagement/responses/SOL005_resp.yaml

@@ -3,7 +3,7 @@
  responses:
    303:
      description: >
-       See Other
+       See Other.
        A subscription with the same callbackURI and the
        same filter already exits and the policy of the NFVO is
        to not create redundant subscriptions.
@@ -13,7 +13,7 @@
        The response body shall be empty. 
    400:
      description: >
-       Bad Request
+       Bad Request.
        
        Error: Invalid attribute-based filtering parameters.
        The response body shall contain a ProblemDetails