SOL002_50: PerformanceReport updated and moved in...

SOL002_50: PerformanceReport updated and moved in SOL002SOL003VNFPerformanceManagement_def.yaml, refs updated

src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml

@@ -334,7 +334,7 @@ paths:
               maximum: 1
               minimum: 0
           schema:
-            $ref: "definitions/VNFPerformanceManagement_def.yaml#/definitions/PerformanceReport"
+            $ref: "../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/PerformanceReport"
         400:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"
         401:

src/SOL002/VNFPerformanceManagement/definitions/VNFPerformanceManagement_def.yaml

 # Copyright (c) ETSI 2017.
 # https://forge.etsi.org/etsi-forge-copyright-notice.txt
 
-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.
-    type: object
-    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.
-        type: array
-        items:
-          type: object
-          required: 
-            - objectType
-            - objectInstanceId
-            - performanceMetric
-            - performanceValue
-          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.
-              type: string
-            objectInstanceId: 
-              description: >
-                The object instance for which the performance metric is
-                reported.
-                The object instances for this information element will be VNF
-                instances.
-              $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
-            performanceMetric:
-              description: >
-                Name of the metric collected.
-              type: string
-            performanceValue:
-              description: >
-                List of performance values with associated timestamp.
-              type: array
-              items: 
-                type: object
-                required: 
-                  - timeStamp
-                  - performanceValue
-                properties:
-                  timeStamp:
-                    description: >
-                      Time stamp indicating when the data was collected.
-                    $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
-                  performanceValue:
-                    description: >
-                      Value of the metric collected.
-                      The type of the "performanceValue" attribute 
-                      (i.e. scalar, structure (Object in JSON), or array 
-                      (of scalars, arrays or structures / Objects)) is assumed
-                      to be defined in an external measurement specification
-                      outside the scope of the present document.
-                    type: object
-
+definitions:
\ No newline at end of file

src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml

@@ -363,7 +363,7 @@ paths:
               maximum: 1
               minimum: 0
           schema:
-            $ref: "definitions/VNFPerformanceManagement_def.yaml#/definitions/PerformanceReport"
+            $ref: "../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/PerformanceReport"
         400:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"
         401:

src/SOL003/VNFPerformanceManagement/definitions/VNFPerformanceManagement_def.yaml

@@ -2,64 +2,4 @@
 # https://forge.etsi.org/etsi-forge-copyright-notice.txt
 
 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.
-    type: object
-    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.
-        type: array
-        items:
-          type: object
-          required: 
-            - objectType
-            - objectInstanceId
-            - performanceMetric
-            - performanceValue
-          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.
-              type: string
-            objectInstanceId: 
-              description: >
-                The object instance (i.e. VNF instance) for which the
-                performance metric is reported.
-              $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
-            performanceMetric:
-              description: >
-                Name of the metric collected.
-              type: string
-            performanceValues:
-              description: >
-                List of performance values with associated timestamp.
-              type: array
-              items: 
-                type: object
-                required: 
-                  - timeStamp
-                  - performanceValue
-                properties:
-                  timeStamp:
-                    description: >
-                      Time stamp indicating when the data was collected.
-                    $ref: "../../../definitions/SOL002SOL003_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).
-                    type: object
 

src/definitions/SOL002SOL003VNFPerformanceManagement_def.yaml

@@ -117,6 +117,79 @@ definitions:
               type "PerformanceReport" can be obtained. This link should point
               to an "Individual performance report" resource.
             $ref: "SOL002SOL003_def.yaml#/definitions/Link"
+            
+  PerformanceReport:
+    description: >
+      This type defines the format of a performance report provided by the VNFM to the EM 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
+    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.
+        type: array
+        items:
+          type: object
+          required:
+            - objectType
+            - objectInstanceId
+            - performanceMetric
+            - performanceValue
+          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.
+              type: string
+            objectInstanceId:
+              description: >
+                The object instance (i.e. VNF instance) for which the
+                performance metric is reported.
+              $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
+            subObjectInstanceId:
+              description: >
+                Identifier of the sub-object of the measured object (i.e. a VNFC instance)
+                for which the performance metric is reported.
+                Shall be present if this is required in the measurement specification.
+                The sub-object allows to structure the measured object,
+                but is not to be confused with sub-counters which allow to structure the measurement.
+                EXAMPLE:
+                  Measured object:  VnfInstanceXYZ
+                  Sub-object:       VnfcInstance1
+                  Measurement:      vCPU_utilization
+                  Sub-counters:     vCPU utilization of each of the vCPUs of VnfcInstance1
+                                    (vCPU_utilization.vCPU1, vCPU_utilization.vCPU2, etc.).
+              $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
+            performanceMetric:
+              description: >
+                Name of the metric collected. This attribute shall contain the related "Measurement Name"
+                value as defined in clause 7.2 of ETSI GS NFV-IFA 027.
+              type: string
+            performanceValues:
+              description: >
+                List of performance values with associated timestamp.
+              type: array
+              items:
+                type: object
+                required:
+                  - timeStamp
+                  - performanceValue
+                properties:
+                  timeStamp:
+                    description: >
+                      Time stamp indicating when the data was collected.
+                    $ref: "SOL002SOL003_def.yaml#/definitions/DateTime"
+                  value:
+                    description: >
+                      Value of the metric collected.
+                      The type of this attribute shall correspond to the related "Measurement Unit"
+                      as defined in clause 7.2. of ETSI GS NFV-IFA 027.
+                    type: object
 
   PmJob:
     description: >