Issue-Id: VNFRQTS-108
Change-Id: I751751bf1bc937ba5f7657370333a8a59b142eaf
Signed-Off-by: Gokul Singaraju <goksing@gmail.com>
typedef struct measurement_fsys_use {
char * filesystem_name;
double block_configured;
typedef struct measurement_fsys_use {
char * filesystem_name;
double block_configured;
double block_used;
double ephemeral_configured;
double block_used;
double ephemeral_configured;
double ephemeral_used;
} MEASUREMENT_FSYS_USE;
double ephemeral_used;
} MEASUREMENT_FSYS_USE;
char * filesystem_name,
double block_configured,
double block_used,
char * filesystem_name,
double block_configured,
double block_used,
double ephemeral_configured,
double ephemeral_used,
double ephemeral_configured,
double ephemeral_used,
+ double ephemeral_iops);
/**************************************************************************//**
* Add a Feature usage value name/value pair to the Measurement.
/**************************************************************************//**
* Add a Feature usage value name/value pair to the Measurement.
{
evel_json_open_object(jbuf);
evel_enc_kv_string(jbuf, "name", measurement_group->name);
{
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. */
/*********************************************************************/
/* Measurements list. */
char * filesystem_name,
double block_configured,
double block_used,
char * filesystem_name,
double block_configured,
double block_used,
double ephemeral_configured,
double ephemeral_used,
double ephemeral_configured,
double ephemeral_used,
{
MEASUREMENT_FSYS_USE * fsys_use = NULL;
EVEL_ENTER();
{
MEASUREMENT_FSYS_USE * fsys_use = NULL;
EVEL_ENTER();
assert(filesystem_name != NULL);
assert(block_configured >= 0.0);
assert(block_used >= 0.0);
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_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. */
/***************************************************************************/
/* Allocate a container for the value and push onto the list. */
fsys_use->block_configured = block_configured;
fsys_use->block_used = block_used;
fsys_use->block_iops = block_iops;
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;
fsys_use->ephemeral_used = ephemeral_used;
fsys_use->ephemeral_iops = ephemeral_iops;
fsys_use->filesystem_name))
{
evel_json_open_object(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_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_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_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;
}
evel_json_close_object(jbuf);
item_added = true;
}
{
evel_json_open_object(jbuf);
evel_enc_kv_string(jbuf, "name", measurement_group->name);
{
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. */
/*********************************************************************/
/* Measurements list. */