From a32d00252c79f0e54b5d0b4dc090916b4d011f55 Mon Sep 17 00:00:00 2001 From: Gokul Singaraju Date: Fri, 29 Sep 2017 14:38:28 -0400 Subject: [PATCH] Add java util funcs for EvelHeader fix custom meas Issue-Id: VNFSDK-101 Change-Id: I849958f30abf003fb7ea5a8764d97e9ad5fd6e4f Signed-Off-by: Gokul Singaraju --- .gitreview | 4 ++ veslibrary/.README.swp | Bin 16384 -> 0 bytes .../src/evel_javalibrary/att/com/EvelFault.java | 5 +- .../src/evel_javalibrary/att/com/EvelHeader.java | 59 +++++++++++++++++++++ .../att/com/EvelScalingMeasurement.java | 7 ++- .../evel_javalib2/src_test/maindir/Main.java | 6 ++- 6 files changed, 76 insertions(+), 5 deletions(-) create mode 100644 .gitreview delete mode 100644 veslibrary/.README.swp diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..148ca16 --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=gerrit.onap.org +port=29418 +project=vnfsdk/compliance diff --git a/veslibrary/.README.swp b/veslibrary/.README.swp deleted file mode 100644 index 67e26f31a86a18da7e7478df6d46d0c289e2d1a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 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 diff --git a/veslibrary/ves_javalibrary/evel_javalib2/src/evel_javalibrary/att/com/EvelFault.java b/veslibrary/ves_javalibrary/evel_javalib2/src/evel_javalibrary/att/com/EvelFault.java index a252378..584a8de 100644 --- a/veslibrary/ves_javalibrary/evel_javalib2/src/evel_javalibrary/att/com/EvelFault.java +++ b/veslibrary/ves_javalibrary/evel_javalib2/src/evel_javalibrary/att/com/EvelFault.java @@ -129,7 +129,7 @@ public class EvelFault extends EvelHeader { *****************************************************************************/ public EvelFault(String evname, String ev_id, String condition, String specproblem, - EvelHeader.PRIORITIES priority, + EvelHeader.PRIORITIES tpriority, EVEL_SEVERITIES severity, EVEL_SOURCE_TYPES ev_source_type, EVEL_VF_STATUSES status) @@ -140,7 +140,7 @@ public class EvelFault extends EvelHeader { //Validate inputs assert( condition != null); assert( specific_problem != null); - assert(EvelHeader.PRIORITIES.EVEL_MAX_PRIORITIES.compareTo(priority) < 0 ); + assert(EvelHeader.PRIORITIES.EVEL_MAX_PRIORITIES.compareTo(tpriority) < 0 ); assert(EVEL_SEVERITIES.EVEL_MAX_SEVERITIES.compareTo(severity) < 0 ); assert(EVEL_VF_STATUSES.EVEL_MAX_VF_STATUSES.compareTo(status) < 0 ); //Init mandatory fields @@ -149,6 +149,7 @@ public class EvelFault extends EvelHeader { alarm_condition = condition; specific_problem = specproblem; vf_status = status; + priority = tpriority; //Init optional fields category = new EvelOptionString(false, null); alarm_interface_a = new EvelOptionString(false, null); diff --git a/veslibrary/ves_javalibrary/evel_javalib2/src/evel_javalibrary/att/com/EvelHeader.java b/veslibrary/ves_javalibrary/evel_javalib2/src/evel_javalibrary/att/com/EvelHeader.java index 8b5538b..cd1ac0b 100644 --- a/veslibrary/ves_javalibrary/evel_javalib2/src/evel_javalibrary/att/com/EvelHeader.java +++ b/veslibrary/ves_javalibrary/evel_javalib2/src/evel_javalibrary/att/com/EvelHeader.java @@ -471,6 +471,65 @@ public class EvelHeader { EVEL_EXIT(); } + /**************************************************************************//** + * Set the Priority property of the event header. + * + * @note The Priority of event being reported. + * + * @param priorityval Value of priority. + * + *****************************************************************************/ + public void evel_header_set_priority(PRIORITIES priority_val) + { + EVEL_ENTER(); + + assert(EvelHeader.PRIORITIES.EVEL_MAX_PRIORITIES.compareTo(priority_val) < 0 ); + + priority = priority_val; + + EVEL_EXIT(); + } + + /**************************************************************************//** + * Set the Priority property of the event header. + * + * @note The Reporting Entity Id defaults to the OpenStack VM UUID. + * + * @param val Optional true or false. + * @param srcid The source id to set. + *****************************************************************************/ + public void evel_header_set_sourceid(boolean val, String srcid) + { + EVEL_ENTER(); + + assert(srcid != null); + + source_id.set_option(val); + + source_id.SetValue(srcid); + + EVEL_EXIT(); + } + + /**************************************************************************//** + * Set the Source name property of the event header. + * + * @note Source name should identify the IP address or Source Event originator + * for inventory + * + * @param srcname String for sourcename. + *****************************************************************************/ + public void evel_header_set_source_name(String srcname) + { + EVEL_ENTER(); + + assert(srcname != null); + + source_name = srcname; + + EVEL_EXIT(); + } + /**************************************************************************//** * Map an ::EVEL_EVENT_DOMAINS enum value to the equivalent string. * diff --git a/veslibrary/ves_javalibrary/evel_javalib2/src/evel_javalibrary/att/com/EvelScalingMeasurement.java b/veslibrary/ves_javalibrary/evel_javalib2/src/evel_javalibrary/att/com/EvelScalingMeasurement.java index 392de48..89897e9 100644 --- a/veslibrary/ves_javalibrary/evel_javalib2/src/evel_javalibrary/att/com/EvelScalingMeasurement.java +++ b/veslibrary/ves_javalibrary/evel_javalib2/src/evel_javalibrary/att/com/EvelScalingMeasurement.java @@ -1946,7 +1946,7 @@ public class EvelScalingMeasurement extends EvelHeader { for(int i=0;i(); if( additional_measurements == null){ + LOGGER.debug("Creating new Measurement Group list"+group); additional_measurements = new ArrayList(); if( additional_measurements == null ){ LOGGER.error("Unable to allocate additional measurements "); @@ -1977,6 +1979,7 @@ public class EvelScalingMeasurement extends EvelHeader { /***************************************************************************/ /* If we didn't have the group already, create it. */ /***************************************************************************/ + LOGGER.debug("Adding custom measurement"); measurement_group.measurements.add(custom_measurement); EVEL_EXIT(); @@ -3620,7 +3623,7 @@ public class EvelScalingMeasurement extends EvelHeader { .add("value",custom_meas.value); builder2.add(obj2.build()); } - obj.add("measurements", builder2); + obj.add("arrayOfFields", builder2); builder.add(obj.build()); } evelmeasmt.add("additionalMeasurements", builder); diff --git a/veslibrary/ves_javalibrary/evel_javalib2/src_test/maindir/Main.java b/veslibrary/ves_javalibrary/evel_javalib2/src_test/maindir/Main.java index 756bac0..f3c676d 100644 --- a/veslibrary/ves_javalibrary/evel_javalib2/src_test/maindir/Main.java +++ b/veslibrary/ves_javalibrary/evel_javalib2/src_test/maindir/Main.java @@ -57,6 +57,7 @@ public class Main AgentMain.evel_initialize("http://127.0.0.1", 30000, "/vendor_event_listener","/example_vnf", + //null,null "pill", "will", Level.DEBUG); @@ -106,7 +107,10 @@ public class Main MEASUREMENT_CPU_USE my2 = sm.evel_measurement_new_cpu_use_add("cpu2", 10.0); my2.steal.SetValue(34.0); my2.user.SetValue(32.0); - + sm.evel_measurement_custom_measurement_add("group1","name1","val1"); + sm.evel_measurement_custom_measurement_add("group1","name2","val2"); + sm.evel_measurement_custom_measurement_add("group2","name1","val1"); + sm.evel_measurement_custom_measurement_add("group2","name2","val2"); MEASUREMENT_VNIC_PERFORMANCE vnic_p = sm.evel_measurement_new_vnic_performance("vnic1","true"); vnic_p.recvd_bcast_packets_acc.SetValue(2400000.0); -- 2.16.6