X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=vnfs%2FVES5.0%2Fevel%2Fevel-library%2Fcode%2Fevel_library%2Fevel_scaling_measurement.c;h=d484b2eb44191ca3502ae93e3f25dded0fa052ae;hb=e40e164479222fbfd9f7728c5b62683d5b8e4ab8;hp=f1b38e3ca4834d587aa75e93da97a86fc6289d33;hpb=4d6ce277921f99c440ebcd1796b4d6447af36f3b;p=demo.git

diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_scaling_measurement.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_scaling_measurement.c
index f1b38e3c..d484b2eb 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_scaling_measurement.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_scaling_measurement.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,7 +13,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and 
  * limitations under the License.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 /**************************************************************************//**
  * @file
@@ -37,13 +38,15 @@
  *          that the Measurement has immutable properties.
  *
  * @param   measurement_interval
+ * @param event_name  Unique Event Name confirming Domain AsdcModel Description
+ * @param event_id    A universal identifier of the event for: troubleshooting correlation, analysis, etc
  *
  * @returns pointer to the newly manufactured ::EVENT_MEASUREMENT.  If the
  *          event is not used (i.e. posted) it must be released using
  *          ::evel_free_event.
  * @retval  NULL  Failed to create the event.
  *****************************************************************************/
-EVENT_MEASUREMENT * evel_new_measurement(double measurement_interval)
+EVENT_MEASUREMENT * evel_new_measurement(double measurement_interval, const char* ev_name, const char *ev_id)
 {
   EVENT_MEASUREMENT * measurement = NULL;
 
@@ -69,7 +72,7 @@ EVENT_MEASUREMENT * evel_new_measurement(double measurement_interval)
   /***************************************************************************/
   /* Initialize the header & the measurement fields.                         */
   /***************************************************************************/
-  evel_init_header(&measurement->header,"vnfScalingMeasurement");
+  evel_init_header_nameid(&measurement->header,ev_name,ev_id);
   measurement->header.event_domain = EVEL_DOMAIN_MEASUREMENT;
   measurement->measurement_interval = measurement_interval;
   dlist_initialize(&measurement->additional_info);
@@ -978,6 +981,25 @@ void evel_measurement_disk_use_mergewritemax_set(MEASUREMENT_DISK_USE * const di
   evel_set_option_double(&disk_use->mergewritemax, val, "Disk writemax set");
   EVEL_EXIT();
 }
+/**************************************************************************//**
+ * Set number of logical write operations that were merged into physical read
+ * operations, e.g., two logical writes were served by one physical disk access;
+ * provide the average measurement within the measurement interval
+ *
+ * @note  The property is treated as immutable: it is only valid to call
+ *        the setter once.  However, we don't assert if the caller tries to
+ *        overwrite, just ignoring the update instead.
+ *
+ * @param disk_use     Pointer to the Disk Use.
+ * @param val          double
+ *****************************************************************************/
+void evel_measurement_disk_use_mergewriteavg_set(MEASUREMENT_DISK_USE * const disk_use,
+                                    const double val)
+{
+  EVEL_ENTER();
+  evel_set_option_double(&disk_use->mergewriteavg, val, "Disk writeavg set");
+  EVEL_EXIT();
+}
 /**************************************************************************//**
  * Set number of logical write operations that were merged into physical read
  * operations, e.g., two logical writes were served by one physical disk access;
@@ -1531,10 +1553,10 @@ void evel_measurement_fsys_use_add(EVENT_MEASUREMENT * measurement,
                                    char * filesystem_name,
                                    double block_configured,
                                    double block_used,
-                                   int block_iops,
+                                   double block_iops,
                                    double ephemeral_configured,
                                    double ephemeral_used,
-                                   int ephemeral_iops)
+                                   double ephemeral_iops)
 {
   MEASUREMENT_FSYS_USE * fsys_use = NULL;
   EVEL_ENTER();
@@ -1547,10 +1569,10 @@ void evel_measurement_fsys_use_add(EVENT_MEASUREMENT * measurement,
   assert(filesystem_name != NULL);
   assert(block_configured >= 0.0);
   assert(block_used >= 0.0);
-  assert(block_iops >= 0);
+  assert(block_iops >= 0.0);
   assert(ephemeral_configured >= 0.0);
   assert(ephemeral_used >= 0.0);
-  assert(ephemeral_iops >= 0);
+  assert(ephemeral_iops >= 0.0);
 
   /***************************************************************************/
   /* Allocate a container for the value and push onto the list.              */
@@ -1563,7 +1585,7 @@ void evel_measurement_fsys_use_add(EVENT_MEASUREMENT * measurement,
   fsys_use->block_configured = block_configured;
   fsys_use->block_used = block_used;
   fsys_use->block_iops = block_iops;
-  fsys_use->ephemeral_configured = block_configured;
+  fsys_use->ephemeral_configured = ephemeral_configured;
   fsys_use->ephemeral_used = ephemeral_used;
   fsys_use->ephemeral_iops = ephemeral_iops;
 
@@ -3201,15 +3223,15 @@ void evel_json_encode_measurement(EVEL_JSON_BUFFER * jbuf,
                                           fsys_use->filesystem_name))
       {
         evel_json_open_object(jbuf);
+        evel_enc_kv_string(jbuf, "filesystemName", fsys_use->filesystem_name);
         evel_enc_kv_double(
           jbuf, "blockConfigured", fsys_use->block_configured);
-        evel_enc_kv_int(jbuf, "blockIops", fsys_use->block_iops);
+        evel_enc_kv_double(jbuf, "blockIops", fsys_use->block_iops);
         evel_enc_kv_double(jbuf, "blockUsed", fsys_use->block_used);
         evel_enc_kv_double(
           jbuf, "ephemeralConfigured", fsys_use->ephemeral_configured);
-        evel_enc_kv_int(jbuf, "ephemeralIops", fsys_use->ephemeral_iops);
+        evel_enc_kv_double(jbuf, "ephemeralIops", fsys_use->ephemeral_iops);
         evel_enc_kv_double(jbuf, "ephemeralUsed", fsys_use->ephemeral_used);
-        evel_enc_kv_string(jbuf, "filesystemName", fsys_use->filesystem_name);
         evel_json_close_object(jbuf);
         item_added = true;
       }
@@ -3516,7 +3538,7 @@ void evel_json_encode_measurement(EVEL_JSON_BUFFER * jbuf,
       {
         evel_json_open_object(jbuf);
         evel_enc_kv_string(jbuf, "name", measurement_group->name);
-        evel_json_open_opt_named_list(jbuf, "measurements");
+        evel_json_open_opt_named_list(jbuf, "arrayOfFields");
 
         /*********************************************************************/
         /* Measurements list.                                                */
@@ -3711,3 +3733,4 @@ void evel_free_measurement(EVENT_MEASUREMENT * event)
 
   EVEL_EXIT();
 }
+