summaryrefslogtreecommitdiffstats
path: root/vnfs
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2017-09-22 17:20:25 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-22 17:20:25 +0000
commit4d02752d42dc30fb5b877169aceb5f362b73f5f6 (patch)
treecb308a44cbc84be5b5580b5de6a0e11c8384c495 /vnfs
parent2cffc4f959ec65c1cf433bbbcaa6ecf9feb742f6 (diff)
parent4e4a33ceb4d6b7f5613e9aefd394ad41cb97e81e (diff)
Merge "Naming custom additional fields and filesys fields"
Diffstat (limited to 'vnfs')
-rw-r--r--vnfs/VES5.0/evel/evel-library/code/evel_library/evel.h8
-rw-r--r--vnfs/VES5.0/evel/evel-library/code/evel_library/evel_reporting_measurement.c2
-rw-r--r--vnfs/VES5.0/evel/evel-library/code/evel_library/evel_scaling_measurement.c18
3 files changed, 14 insertions, 14 deletions
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel.h b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel.h
index 6aceec30..0ae1713e 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel.h
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel.h
@@ -738,10 +738,10 @@ MEASUREMENT_DISK_USE * evel_measurement_new_disk_use_add(EVENT_MEASUREMENT * mea
typedef struct measurement_fsys_use {
char * filesystem_name;
double block_configured;
- int block_iops;
+ double block_iops;
double block_used;
double ephemeral_configured;
- int ephemeral_iops;
+ double ephemeral_iops;
double ephemeral_used;
} MEASUREMENT_FSYS_USE;
@@ -1955,10 +1955,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);
/**************************************************************************//**
* Add a Feature usage value name/value pair to the Measurement.
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_reporting_measurement.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_reporting_measurement.c
index 36c34daa..38a17313 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_reporting_measurement.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_reporting_measurement.c
@@ -329,7 +329,7 @@ void evel_json_encode_report(EVEL_JSON_BUFFER * jbuf,
{
evel_json_open_object(jbuf);
evel_enc_kv_string(jbuf, "name", measurement_group->name);
- evel_json_open_named_list(jbuf, "measurements");
+ evel_json_open_named_list(jbuf, "arrayOfFields");
/*********************************************************************/
/* Measurements list. */
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 22626f92..7920d81b 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
@@ -1533,10 +1533,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();
@@ -1549,10 +1549,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. */
@@ -1565,7 +1565,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;
@@ -3203,15 +3203,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;
}
@@ -3518,7 +3518,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. */