MonitoringParameter updated in SOL002SOL003VNFLifecycleManagement_def.yaml,...

MonitoringParameter updated in SOL002SOL003VNFLifecycleManagement_def.yaml, MonitoringParameter removed from VNFLifecycleManagement_def.yaml and refs updated

src/SOL002/VNFLifecycleManagement/definitions/VNFLifecycleManagement_def.yaml

@@ -387,7 +387,7 @@ definitions:
           Active monitoring parameters.
         type: array
         items:
-          $ref: "#/definitions/MonitoringParameter"
+          $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/MonitoringParameter"
       localizationLanguage:
         description: >
           Information about localization language of the VNF (includes e.g.
@@ -499,27 +499,6 @@ definitions:
               instance resource (i.e. VNF instance is in INSTANTIATED state).
             $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
 
-  MonitoringParameter:
-    type: object
-    required:
-      - id
-      - performanceMetric
-    properties:
-      id:
-        description: >
-          Identifier of the monitoring parameter defined in the VNFD.
-        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd"
-      name:
-        description: >
-          Human readable name of the monitoring parameter, as defined in the
-          VNFD.
-        type: string
-      performanceMetric:
-        description: >
-          Performance metric that is monitored. This attribute shall contain the
-          related "Measurement Name" value as defined in clause 7.2 of ETSI GS NFV-IFA 027.
-        type: string
-
   LccnLinks:
     description: >
       This type represents the links to resources that a notification can

src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml

@@ -465,8 +465,7 @@ definitions:
     type: object
     required:
       - id
-      - value
-      - timeStamp
+      - performanceMetric
     properties:
       id:
         description: >
@@ -477,19 +476,10 @@ definitions:
           Human readable name of the monitoring parameter, as defined in the
           VNFD.
         type: string
-      value:
-        description: >
-          Value of the monitoring parameter known to the VNFM (e.g. obtained
-          for autoscaling purposes).
-          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 an external measurement specification.
-        type: object
-      timeStamp:
+      performanceMetric:
         description: >
-          Represents the point in time when the measurement has been performed,
-          as known to the VNFM.
-          Should be formatted according to ETF RFC 3339.
+          Performance metric that is monitored. This attribute shall contain the
+          related "Measurement Name" value as defined in clause 7.2 of ETSI GS NFV-IFA 027.
         type: string
 
   ScaleInfo: