From a939d3cda9fef3a935dc6176ab88241619eb344c Mon Sep 17 00:00:00 2001 From: Bryan Sullivan Date: Sat, 15 Oct 2016 08:39:52 -0700 Subject: [PATCH] Fix agent startup, add monitor.py and favicon JIRA: VES-1 Report intended traffic measurement at agent Change-Id: I587150f80eebfdd4b1efaafc48b78db30dd33468 Signed-off-by: Bryan Sullivan --- tests/blueprints/tosca-vnfd-hello-ves/evel_demo.c | 3 +- tests/blueprints/tosca-vnfd-hello-ves/favicon.ico | Bin 0 -> 1150 bytes tests/blueprints/tosca-vnfd-hello-ves/logo.png | Bin 0 -> 4212 bytes tests/blueprints/tosca-vnfd-hello-ves/monitor.py | 33 ++++++++++++++++++++++ tests/blueprints/tosca-vnfd-hello-ves/start.sh | 12 ++++++-- tests/vHello_VES.sh | 4 +-- 6 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 tests/blueprints/tosca-vnfd-hello-ves/favicon.ico create mode 100644 tests/blueprints/tosca-vnfd-hello-ves/logo.png create mode 100644 tests/blueprints/tosca-vnfd-hello-ves/monitor.py diff --git a/tests/blueprints/tosca-vnfd-hello-ves/evel_demo.c b/tests/blueprints/tosca-vnfd-hello-ves/evel_demo.c index 50f45ec..39cd528 100644 --- a/tests/blueprints/tosca-vnfd-hello-ves/evel_demo.c +++ b/tests/blueprints/tosca-vnfd-hello-ves/evel_demo.c @@ -211,7 +211,7 @@ void measure_traffic() { time (&rawtime); timeinfo = localtime (&rawtime); strftime(period,7,"%H:%M:",timeinfo); - strftime(secs,2,"%S",timeinfo); + strftime(secs,3,"%S",timeinfo); sec = atoi(secs); if (sec == 0) sec = 59; sprintf(secs, "%02d", sec); @@ -228,6 +228,7 @@ void measure_traffic() { if (fgets(count, 10, fp) != NULL) { request_rate = atoi(count); + printf("Reporting request rate for second: %s as %d\n", period, request_rate); measurement = evel_new_measurement(concurrent_sessions, configured_entities, mean_request_latency, measurement_interval, memory_configured, memory_used, request_rate); diff --git a/tests/blueprints/tosca-vnfd-hello-ves/favicon.ico b/tests/blueprints/tosca-vnfd-hello-ves/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..cd95189428d27323bae5549be68363ebb3e43cbb GIT binary patch literal 1150 zcmbVMOHUI~6uu_z+z=Dp`bbRt3mUiT!UZcAxG-_2k)01>jJiNv`G_%S6j6hZ1W*AH zRJ6PT6iQ2h60wv%n9}KE$}nxGGt%A$tiShpEsIjW}^S5kj%uyBuLYRrrTdDl5>9(qA$yh8LtDa$=yCtCeKjes~O{ z?&mCKnnn%#W7u4WzbSZ;2zNm(rWian-HwxI2>QO=VZLFMVOj>wcJiw{%Q6{m8Y%>S z6pEZ+{)DFkSDFuDQ*!)j9s?`NG&E)@atvJfC5naB8eG;j2x1gm$`7qnfT*T0pZozy z&9I#4ulsQI?7@QjEJVQ#&saScJr|(sGQ(|-=Vuq@mwU0myKw32QJnjD0E?+nhUY{d zroJD+NN*jo$$qGE5TT_T^b8S(=jAk(qb`)RJmrkwiKh`$To1!++i#hH;wQw4k9B&;2LX3T8P>Z(u#=A*a&!a6YEk4-GNq2#6F``srkh8 zTbw#gP~Si>Jl=-3j*Doydjhdk5bli-q6Hq;=ANM?@D4$78LjRnTpwz{)Y=!eKDQpg zz|aH4*O!pV#?aAu8IkY|xMCKs!^2pUGg!&R@pR=AQuGXET|tztBbS^yutlh{ET@uE zE{$1VA2>0NfrJ;lvVjB@wbK7v-`nQe{bbM@R{MH#rW>8T&5-gLXtYli+CScG2&;LX zZDsSFdvW$-!7Xai^B&&$!CJ0ua76*33V%!Lwx+7dFbwBTt7o-mecSI2sQw53cm55o CYpEvy literal 0 HcmV?d00001 diff --git a/tests/blueprints/tosca-vnfd-hello-ves/logo.png b/tests/blueprints/tosca-vnfd-hello-ves/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..a4bf310991b8b5464ea43e0645a007f33d372c8d GIT binary patch literal 4212 zcmeHKSyWS57JXsRBtQu=Ng)y=8(ZgF5kF`y5^S8?iD-m)f(o3Fjd8`gitD9WbZl_c*hJ?+L4nHspu+ zGD8=d+{Or+={drDBIvrn!|IetOiIZ^MWjGO8^%#UuO7PI~5uc(oZ#dtOawdNeW z`{cuPUaRc!>Yc$BhTnZ4sQ~~~i6zg-m+XcO=CYAg8aIfJ6tE-YsR96QhaiF)97gBE zg6Iqu2M>SV+zN-WXn45KHZqzVv5U@Rxd@}^dxVs|!NRa$I~sh4JrpOv$_3bTJ{2Zl zhjVyX0UrKQ7b|~OETiDCj}(3w9_~x_fbHT&(P7p|Ya|-sC}724;Py}$E{Ya{^&&cb zl90dQ;Y>b10*gY$#>OIJt&rR(2FlXT&JKmfpfDJOoPprQarjgLg2UUWkob=VkLHA+N_{`5iU)EjdECy3v#JFoG;&$UC3iC9*CmSOk^pYSSke%YpGh@#znA@E_J)#A-7jIoOM2fR7{ zrZ>cDRd*w^&Yg4|pJi;xvTK2Y;YycOVL(4%!O&Jqbq7Nnv>Zw(;`9z}Clp#4^nCYP zFcZ_HGQIlrbrB#Ms9_|xU#U;j2TBAgTEJjI8g=B{`{c+v!R1J;rHE3cw(FUM)&uHC zHZ1bU&4FkiX(wr?ZT>rH(oKeV z_fsh^M@t3dP&;JT1e=rCfGpB-8V*tA0Y+`s#YaY-oOK3XhMI*9FHE>sXl6O-bq{L~ zH5=u$J@T?Wac1-OAu0M??ayWV9Hki+mL^iXQPr826T{hRGp=@lH))CFQ^KbD3C-;M zspJmzT60phEXFF$JFlZ+V|1ofDlldmutjai?P4eR(6o1Pb?lFhz-5kPe=`!of3Sbj zBov^m39=jF_JRTEt{NF4F53s4IpgYA2LXkfq(6N?DNzo>z#@TzN0;VqMbyOvRNJ-V zjH;rG&FyqMlo+S-TPpf;**FR0A2pHct(#+3&HE>dxG~cV zD1^BIm{Q&zEYLq7DfZU)n8oNzbZ!|;&baKu>zt!)lQd?O^oHsEn&Vh1qG2ZsIl7M< zXT5T7FZjY1c3Lo^c&VbUA57hfcQ@5~RE5;tAvVRa$<}q1@xT_)(c6+@v&F!o;w3O~ z4ZD2CBVI+ewG`Jad14w+1L`*bH|LU$%_XY}G;bK-^>1!BUVv{pOIy4%)4}nao!I$~ zgDmNxC*?lIJS!n^yVrjC7SK!Rms~6tt~p zqdQKMiy(n_ga;PgDwyJ#n#P6!^WF#x5XjCZn`)L#O_$W}IllpkB z`0_|a?{Qlo(HC*%nzfc)I_ULX}THo8e zTJ(?Uhc@igF+TyXUqANDq`y%~)IKJheAO%}JCBXD?UTg4%`{_0;P<@SfZH>sPux%A=c%Rltyw^qt?!X=Ha2|ozh X4!i<8 /tmp/cron @@ -80,6 +86,8 @@ Hello World!
EOM +cp ~/ves/tests/blueprints/tosca-vnfd-hello-ves/favicon.ico ~/www/html/favicon.ico + echo "$0: Install docker" # Per https://docs.docker.com/engine/installation/linux/ubuntulinux/ # Per https://www.digitalocean.com/community/tutorials/how-to-install-and-use-docker-on-ubuntu-16-04 diff --git a/tests/vHello_VES.sh b/tests/vHello_VES.sh index 206eec5..95d3f4f 100644 --- a/tests/vHello_VES.sh +++ b/tests/vHello_VES.sh @@ -254,10 +254,10 @@ collector () { ssh -i /tmp/vHello.pem -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ubuntu@$VDU2_IP << 'EOF' sudo kill $(ps -ef | grep evel-test-collector | awk '{print $2}') cd /home/ubuntu/ -python evel-test-collector/code/collector/collector.py \ +nohup python evel-test-collector/code/collector/collector.py \ --config evel-test-collector/config/collector.conf \ --section default \ - --verbose >~/ves.log + --verbose >~/ves.log & EOF } -- 2.16.6