Add CPU usage reporting

JIRA: VES-1

Change-Id: Id2b5dc8bef0aa5de478835aa9505ee9f7a4618db
Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>

diff --git a/tests/blueprints/tosca-vnfd-hello-ves/evel_demo.c b/tests/blueprints/tosca-vnfd-hello-ves/evel_demo.c
index 0eb655c..6221a02 100644 (file)
--- a/tests/blueprints/tosca-vnfd-hello-ves/evel_demo.c
+++ b/tests/blueprints/tosca-vnfd-hello-ves/evel_demo.c
@@ -180,6 +180,52 @@ void check_app_container_state() {
  *
  * param[in]  none
  *****************************************************************************/
+
+double cpu(char *id) {
+  double a, b, loadavg;
+  FILE *fp;
+  int status;
+  char str[100], save[100];
+  char *cpu;
+  a = 0;
+  b = 0;
+
+  fp = popen("cat /proc/stat", "r");
+  if (fp == NULL) {
+    EVEL_ERROR("popen failed to execute command");
+  }
+
+  while (fgets(str, 100, fp) != NULL) {
+    strcpy(save, str);
+//    printf("line: %s\n", str);
+    cpu = strtok(str, " ");
+    if (strcmp(cpu, id) == 0) {
+      // Sum across user, nice, system, idle
+      strcpy(str, save);
+      a = atof(strtok(NULL, " "));
+      strcpy(str, save);
+      a += atof(strtok(NULL, " "));
+      strcpy(str, save);
+      a += atof(strtok(NULL, " "));
+      strcpy(str, save);
+      b = a + atof(strtok(NULL, " "));
+      loadavg = a/b;
+      printf("Load for %s found: %f\n", id, a/b);
+      break;
+    }
+    else if (strcmp(cpu, "intr") == 0) {
+      loadavg = -1;
+      break;
+    }
+  }
+
+  status = pclose(fp);
+  if (status == -1) {
+    EVEL_ERROR("pclose returned an error");
+  }
+  return(loadavg);
+}
+
 void measure_traffic() {
 
   printf("Checking app traffic\n");
@@ -191,7 +237,7 @@ void measure_traffic() {
   char count[10];
   time_t rawtime;
   struct tm * timeinfo;
-  char period [9];
+  char period [21];
   char cmd [100];
   int concurrent_sessions = 0;
   int configured_entities = 0;
@@ -202,16 +248,18 @@ void measure_traffic() {
   int request_rate;
   char secs [3];
   int sec;
+  double loadavg;
 
   time (&rawtime);
   timeinfo = localtime (&rawtime);
-  strftime(period,7,"%H:%M:",timeinfo);
+  strftime(period,21,"%d/%b/%Y:%H:%M:",timeinfo);
   strftime(secs,3,"%S",timeinfo);
   sec = atoi(secs);
   if (sec == 0) sec = 59;
   sprintf(secs, "%02d", sec);
-  strncat(period, secs, 9);
-
+  strncat(period, secs, 21);
+  // ....x....1....x....2.
+  // 15/Oct/2016:17:51:19
   strcpy(cmd, "sudo docker logs vHello | grep -c ");
   strncat(cmd, period, 100);
 
@@ -229,9 +277,21 @@ void measure_traffic() {
 
     if (measurement != NULL) {
       evel_measurement_type_set(measurement, "HTTP request rate");
-      evel_measurement_agg_cpu_use_set(measurement, 8.8);
-      evel_measurement_cpu_use_add(measurement, "cpu1", 11.11);
-      evel_measurement_cpu_use_add(measurement, "cpu2", 22.22);
+      if ((loadavg=cpu("cpu")) != -1) {
+        evel_measurement_agg_cpu_use_set(measurement, loadavg);
+      }
+      if ((loadavg=cpu("cpu0")) != -1) {
+        evel_measurement_cpu_use_add(measurement, "cpu0", loadavg);
+      }
+      if ((loadavg=cpu("cpu1")) != -1) {
+        evel_measurement_cpu_use_add(measurement, "cpu1", loadavg);
+      }
+      if ((loadavg=cpu("cpu2")) != -1) {
+        evel_measurement_cpu_use_add(measurement, "cpu2", loadavg);
+      }
+      if ((loadavg=cpu("cpu3")) != -1) {
+        evel_measurement_cpu_use_add(measurement, "cpu3", loadavg);
+      }
       evel_measurement_fsys_use_add(measurement,"00-11-22",100.11, 100.22, 33,
                                                            200.11, 200.22, 44);
       evel_measurement_fsys_use_add(measurement,"33-44-55",300.11, 300.22, 55,

diff --git a/tests/blueprints/tosca-vnfd-hello-ves/monitor.py b/tests/blueprints/tosca-vnfd-hello-ves/monitor.py
index d861f05..372d586 100644 (file)
--- a/tests/blueprints/tosca-vnfd-hello-ves/monitor.py
+++ b/tests/blueprints/tosca-vnfd-hello-ves/monitor.py
@@ -19,17 +19,39 @@
 #
 # Status: this is a work in progress, under test.
 
+import os
 import time
+import sys
+import select
 
 report_time = ""
 request_rate = ""
 app_state = ""
+mode = "f"
+summary = ""
+status = ""
+
+def print_there(x, y, text):
+     sys.stdout.write("\x1b7\x1b[%d;%df%s\x1b8" % (x, y, text))
+     sys.stdout.flush()
+
+a,b = os.popen('stty size', 'r').read().split()
+columns = int(b)
 
 with open('/home/ubuntu/ves.log') as f:
   while True:
+    if sys.stdin in select.select([sys.stdin], [], [], 0)[0]:
+      line = sys.stdin.readline()
+      if "f" in line: mode = "f"
+      if "c" in line: mode = "c"
+      # Update screen as the <cr> messed up the display!
+      print_there(1,columns-56,summary)
+      print_there(2,columns-56,status)
+
     line = f.readline()
     if line:
-#        print "line: ", line,
+      if mode == "f": 
+        print line,
 
       if "lastEpochMicrosec" in line:
 #0....5....1....5....2....5....3....5....4....5....5
@@ -48,14 +70,23 @@ with open('/home/ubuntu/ves.log') as f:
 #....5....1....5....2....5....3....5
 #            "requestRate": 2264,
         request_rate = line[27:-2]
-        print '{0} app state: {1}\trequest rate: {2}'.format(
+        summary = report_time + " app state: " + app_state + ", request rate: " + request_rate 
+        print_there(1,columns-56,summary)
+#2016-10-16 17:15:29 app state: Started, request rate: 99
+#....5....1....5....2....5....3....5....4....5....5....5....6
+        if mode == "c": print '{0} *** app state: {1}\trequest rate: {2}'.format(
           report_time, app_state, request_rate)
 
       if "\"specificProblem\": \"Started\"" in line:
         app_state = "Started"
-        print '{0} app state change: Started'.format(report_time)
+        status = report_time + " app state change: Started"
+        if mode == "c": print '{0} *** app state change: Started'.format(report_time)
 
       if "\"specificProblem\": \"Stopped\"" in line:
         app_state = "Stopped"
-        print '{0} app state change: Stopped'.format(report_time)
+        status = report_time + " app state change: Stopped"
+        if mode == "c": print '{0} *** app state change: Stopped'.format(report_time)
+
+      print_there(1,columns-56,summary)
+      print_there(2,columns-56,status)