Add java util funcs for EvelHeader fix custom meas

Issue-Id:  VNFSDK-101
Change-Id: I849958f30abf003fb7ea5a8764d97e9ad5fd6e4f
Signed-Off-by: Gokul Singaraju <goksing@gmail.com>

diff --git a/.gitreview b/.gitreview
new file mode 100644 (file)
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 (file)
index 67e26f3..0000000
Binary files a/veslibrary/.README.swp and /dev/null differ

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 (file)
--- 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 {
           *****************************************************************************/\r
        public EvelFault(String evname, String ev_id,\r
                                 String condition, String specproblem,\r
-                     EvelHeader.PRIORITIES priority,\r
+                     EvelHeader.PRIORITIES tpriority,\r
                      EVEL_SEVERITIES severity,\r
                      EVEL_SOURCE_TYPES ev_source_type,\r
                      EVEL_VF_STATUSES status)\r
@@ -140,7 +140,7 @@ public class EvelFault extends EvelHeader {
                //Validate inputs\r
                assert( condition != null);\r
                assert( specific_problem != null);\r
-               assert(EvelHeader.PRIORITIES.EVEL_MAX_PRIORITIES.compareTo(priority) < 0 );\r
+               assert(EvelHeader.PRIORITIES.EVEL_MAX_PRIORITIES.compareTo(tpriority) < 0 );\r
                assert(EVEL_SEVERITIES.EVEL_MAX_SEVERITIES.compareTo(severity) < 0 );\r
                assert(EVEL_VF_STATUSES.EVEL_MAX_VF_STATUSES.compareTo(status) < 0 );\r
                //Init mandatory fields\r
@@ -149,6 +149,7 @@ public class EvelFault extends EvelHeader {
                alarm_condition = condition;\r
                specific_problem = specproblem;\r
                vf_status = status;\r
+               priority = tpriority;\r
                //Init optional fields\r
                category = new EvelOptionString(false, null);\r
                alarm_interface_a = new EvelOptionString(false, null);\r

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 (file)
--- 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();\r
          }\r
          \r
+         /**************************************************************************//**\r
+          * Set the Priority property of the event header.\r
+          *\r
+          * @note The Priority of event being reported.\r
+          *\r
+          * @param priorityval    Value of priority.\r
+          * \r
+          *****************************************************************************/\r
+         public void evel_header_set_priority(PRIORITIES priority_val)\r
+         {\r
+           EVEL_ENTER();\r
+           \r
+           assert(EvelHeader.PRIORITIES.EVEL_MAX_PRIORITIES.compareTo(priority_val) < 0 );\r
+           \r
+           priority = priority_val;\r
+\r
+           EVEL_EXIT();\r
+         }\r
+         \r
+         /**************************************************************************//**\r
+          * Set the Priority property of the event header.\r
+          *\r
+          * @note The Reporting Entity Id defaults to the OpenStack VM UUID.\r
+          *\r
+          * @param val       Optional true or false.\r
+          * @param srcid     The source id to set.\r
+          *****************************************************************************/\r
+         public void evel_header_set_sourceid(boolean val, String srcid)\r
+         {\r
+           EVEL_ENTER();\r
+           \r
+           assert(srcid != null);\r
+           \r
+           source_id.set_option(val);\r
+           \r
+           source_id.SetValue(srcid);\r
+\r
+           EVEL_EXIT();\r
+         }\r
+         \r
+         /**************************************************************************//**\r
+          * Set the Source name property of the event header.\r
+          *\r
+          * @note Source name should identify the IP address or Source Event originator\r
+          *       for inventory\r
+          *\r
+          * @param srcname  String for sourcename.\r
+          *****************************************************************************/\r
+         public void evel_header_set_source_name(String srcname)\r
+         {\r
+           EVEL_ENTER();\r
+           \r
+           assert(srcname != null);\r
+           \r
+           source_name = srcname;\r
+\r
+           EVEL_EXIT();\r
+         }\r
+         \r
          /**************************************************************************//**\r
           * Map an ::EVEL_EVENT_DOMAINS enum value to the equivalent string.\r
           *\r

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 (file)
--- 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<additional_measurements.size();i++)\r
              {\r
                  item = additional_measurements.get(i);\r
-                 if( item.name.equals(name))\r
+                 if( item.name.equals(group))\r
                  {\r
                          LOGGER.debug("Found existing Measurement Group");\r
                          measurement_group = item;\r
@@ -1965,7 +1965,9 @@ public class EvelScalingMeasurement extends EvelHeader {
              assert(measurement_group != null);\r
              measurement_group.name = group;\r
              assert(measurement_group.name != null);\r
+             measurement_group.measurements = new ArrayList<CUSTOM_MEASUREMENT>();\r
              if( additional_measurements == null){\r
+                 LOGGER.debug("Creating new Measurement Group list"+group);\r
                  additional_measurements = new ArrayList<MEASUREMENT_GROUP>();\r
                  if( additional_measurements == null ){\r
                          LOGGER.error("Unable to allocate additional measurements ");\r
@@ -1977,6 +1979,7 @@ public class EvelScalingMeasurement extends EvelHeader {
            /***************************************************************************/\r
            /* If we didn't have the group already, create it.                         */\r
            /***************************************************************************/\r
+           LOGGER.debug("Adding custom measurement");\r
            measurement_group.measurements.add(custom_measurement);\r
 \r
            EVEL_EXIT();\r
@@ -3620,7 +3623,7 @@ public class EvelScalingMeasurement extends EvelHeader {
                                                                    .add("value",custom_meas.value);\r
                                  builder2.add(obj2.build());     \r
                          }\r
-                         obj.add("measurements", builder2);\r
+                         obj.add("arrayOfFields", builder2);\r
                          builder.add(obj.build());\r
                    }\r
                        evelmeasmt.add("additionalMeasurements", builder);\r

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 (file)
--- 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
 \r
         AgentMain.evel_initialize("http://127.0.0.1", 30000,\r
                               "/vendor_event_listener","/example_vnf",\r
+                              //null,null\r
                 "pill",\r
                 "will",\r
                 Level.DEBUG);\r
@@ -106,7 +107,10 @@ public class Main
               MEASUREMENT_CPU_USE my2 = sm.evel_measurement_new_cpu_use_add("cpu2", 10.0);\r
               my2.steal.SetValue(34.0);\r
               my2.user.SetValue(32.0);\r
-\r
+              sm.evel_measurement_custom_measurement_add("group1","name1","val1");\r
+              sm.evel_measurement_custom_measurement_add("group1","name2","val2");\r
+              sm.evel_measurement_custom_measurement_add("group2","name1","val1");\r
+              sm.evel_measurement_custom_measurement_add("group2","name2","val2");\r
 \r
               MEASUREMENT_VNIC_PERFORMANCE vnic_p = sm.evel_measurement_new_vnic_performance("vnic1","true");\r
               vnic_p.recvd_bcast_packets_acc.SetValue(2400000.0);\r