X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=vnfs%2FVES5.0%2Fevel%2Fevel-library%2Fcode%2FVESreporting_vFW%2Fmeas_config.json;h=4fd5621dece4a935934162a8aa0d200ce5e09959;hb=ac4ab50bdf312a1824388acbb9908c31f2b39c1a;hp=14f98650a899aa7d5fcc531138d892f3cfb5088f;hpb=06e584f80beaa11ff180ed0348202287574a208c;p=demo.git

diff --git a/vnfs/VES5.0/evel/evel-library/code/VESreporting_vFW/meas_config.json b/vnfs/VES5.0/evel/evel-library/code/VESreporting_vFW/meas_config.json
index 14f98650..4fd5621d 100644
--- a/vnfs/VES5.0/evel/evel-library/code/VESreporting_vFW/meas_config.json
+++ b/vnfs/VES5.0/evel/evel-library/code/VESreporting_vFW/meas_config.json
@@ -1,50 +1,53 @@
 {
-   "tmp_directParameters": {
-       "eventName": "Measurement_vFirewall-AT&T_nicPerformance",
-       "eventType": "applicationVnf",
-       "nfcNamingCode": "AFX",
-       "nfNamingCode": "AFX",
-       "priority": "Low",
-       "reportingEntityId": "cc305d54-75b4-431b-adb2-eb6b9e541234",
-       "reportingEntityName": "ibcx0001vm002oam001",
-       "sourceId": "de305d54-75b4-431b-adb2-eb6b9e546014",
-       "sourceName": "scfx0001vm002cap001",
-       "measurementInterval": 20,
-       "tmp_device": ["lo", "enp0s3", "docker0"]
-
+    "tmp_directParameters": {
+        "eventName": "Measurement_vFirewall-AT&T_nicPerformance",
+        "eventType": "applicationVnf",
+        "nfcNamingCode": "AFX",
+        "nfNamingCode": "AFX",
+        "priority": "Low",
+        "reportingEntityId": "cc305d54-75b4-431b-adb2-eb6b9e541234",
+        "reportingEntityName": "ibcx0001vm002oam001",
+        "sourceId": "de305d54-75b4-431b-adb2-eb6b9e546014",
+        "sourceName": "scfx0001vm002cap001",
+        "measurementInterval": 20,
+        "tmp_device": [
+            "lo",
+            "enp0s3",
+            "docker0"
+        ]
     },
-    "tmp_indirectParameters":   {
-       "tmp_init":{
-              "tmp_t0BytesIn": "sudo cat /proc/net/dev | grep $tmp_device | tr -s ' ' | cut -d ':' -f2 | cut -d ' ' -f2",
-               "tmp_t0BytesOut": "sudo cat /proc/net/dev | grep $tmp_device | tr -s ' ' | cut -d ':' -f2 | cut -d ' ' -f10", 
-               "tmp_t0PacketsIn": "sudo cat /proc/net/dev | grep $tmp_device | tr -s ' ' | cut -d ':' -f2 | cut -d ' ' -f3", 
-               "tmp_t0PacketsOut": "sudo cat /proc/net/dev | grep $tmp_device | tr -s ' ' | cut -d ':' -f2 | cut -d ' ' -f11" 
-       },
-       "vNicPerformance": {
-           "tmp_vnic_command": {
-               "tmp_t1BytesIn": "sudo cat /proc/net/dev | grep $tmp_device | tr -s ' ' | cut -d ':' -f2 | cut -d ' ' -f2", 
-               "tmp_t1BytesOut": "sudo cat /proc/net/dev | grep $tmp_device | tr -s ' ' | cut -d ':' -f2 | cut -d ' ' -f10", 
-               "tmp_t1PacketsIn": "sudo cat /proc/net/dev | grep $tmp_device | tr -s ' ' | cut -d ':' -f2 | cut -d ' ' -f3", 
-               "tmp_t1PacketsOut": "sudo cat /proc/net/dev | grep $tmp_device | tr -s ' ' | cut -d ':' -f2 | cut -d ' ' -f11" 
-           },
-           "receivedOctetsDelta": "$(tmp_t1BytesIn - tmp_t0BytesIn)",
-           "receivedTotalPacketsDelta": "$(tmp_t1PacketsIn - tmp_t0PacketsIn)",
-           "transmittedOctetsDelta": "$(tmp_t1BytesOut - tmp_t0BytesOut)",
-           "transmittedTotalPacketsDelta": "$(tmp_t1PacketsOut - tmp_t0PacketsOut)",
-           "valuesAreSuspect": "true",
-           "vNicIdentifier": "$tmp_device"
-       },
-       "cpuUsage": {
-           "tmp_cpuuse_command": {
+    "tmp_indirectParameters": {
+        "tmp_init": {
+            "tmp_t0BytesIn": "sudo cat /proc/net/dev | grep $tmp_device | tr -s ' ' | cut -d ':' -f2 | cut -d ' ' -f2",
+            "tmp_t0BytesOut": "sudo cat /proc/net/dev | grep $tmp_device | tr -s ' ' | cut -d ':' -f2 | cut -d ' ' -f10",
+            "tmp_t0PacketsIn": "sudo cat /proc/net/dev | grep $tmp_device | tr -s ' ' | cut -d ':' -f2 | cut -d ' ' -f3",
+            "tmp_t0PacketsOut": "sudo cat /proc/net/dev | grep $tmp_device | tr -s ' ' | cut -d ':' -f2 | cut -d ' ' -f11"
+        },
+        "vNicPerformance": {
+            "tmp_vnic_command": {
+                "tmp_t1BytesIn": "sudo cat /proc/net/dev | grep $tmp_device | tr -s ' ' | cut -d ':' -f2 | cut -d ' ' -f2",
+                "tmp_t1BytesOut": "sudo cat /proc/net/dev | grep $tmp_device | tr -s ' ' | cut -d ':' -f2 | cut -d ' ' -f10",
+                "tmp_t1PacketsIn": "sudo cat /proc/net/dev | grep $tmp_device | tr -s ' ' | cut -d ':' -f2 | cut -d ' ' -f3",
+                "tmp_t1PacketsOut": "sudo cat /proc/net/dev | grep $tmp_device | tr -s ' ' | cut -d ':' -f2 | cut -d ' ' -f11"
+            },
+            "receivedOctetsDelta": "$(tmp_t1BytesIn - tmp_t0BytesIn)",
+            "receivedTotalPacketsDelta": "$(tmp_t1PacketsIn - tmp_t0PacketsIn)",
+            "transmittedOctetsDelta": "$(tmp_t1BytesOut - tmp_t0BytesOut)",
+            "transmittedTotalPacketsDelta": "$(tmp_t1PacketsOut - tmp_t0PacketsOut)",
+            "valuesAreSuspect": "true",
+            "vNicIdentifier": "$tmp_device"
+        },
+        "cpuUsage": {
+            "tmp_cpuuse_command": {
                 "tmp_cpuUseCmd": "/usr/bin/top -bn 2 -d 0.01 | grep '^%Cpu' | tail -n 1 | cut -d ':' -f2",
                 "tmp_cpuIdle": "/usr/bin/top -bn 2 -d 0.01 | grep '^%Cpu' | tail -n 1 |cut -d ':' -f2 | cut -d ',' -f4 | cut -b 1-5",
                 "tmp_cpuUsageSystem": "/usr/bin/top -bn 2 -d 0.01 | grep '^%Cpu' | tail -n 1 |cut -d ':' -f2 | cut -d ',' -f2 | cut -b 1-5",
                 "tmp_cpuUsageUser": "/usr/bin/top -bn 2 -d 0.01 | grep '^%Cpu' | tail -n 1 |cut -d ':' -f2 | cut -d ',' -f1 | cut -b 1-5"
-           },
-           "cpuIdentifier": "Cpu1",
-           "cpuIdle": "$tmp_cpuIdle",
-           "cpuUsageSystem": "$tmp_cpuUsageSystem",
-           "cpuUsageUser": "$tmp_cpuUsageUser"
-       }
-   }
+            },
+            "cpuIdentifier": "Cpu1",
+            "cpuIdle": "$tmp_cpuIdle",
+            "cpuUsageSystem": "$tmp_cpuUsageSystem",
+            "cpuUsageUser": "$tmp_cpuUsageUser"
+        }
+    }
 }