Merge "increase number of open files for collectd"
authorRoss Brattain <ross.b.brattain@intel.com>
Thu, 12 Oct 2017 23:40:04 +0000 (23:40 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 12 Oct 2017 23:40:04 +0000 (23:40 +0000)
52 files changed:
ansible/install_collectd.yml
ansible/roles/download_collectd/defaults/main.yml
ansible/roles/download_intel_cmt_cat/defaults/main.yml
ansible/roles/download_pmu_tools/defaults/main.yml
ansible/roles/download_pmu_tools/files/event_download_local.py
ansible/roles/download_pmu_tools/tasks/main.yml
dashboard/Prox_BM_ACL-2Port-1507803762832.json [moved from dashboard/Prox_BM_ACL_Test-2Port-1499777741771.json with 81% similarity]
dashboard/Prox_BM_ACL-4Port-1507803770817.json [moved from dashboard/Prox_BM_ACL_Test-4Port-1499777725160.json with 83% similarity]
dashboard/Prox_BM_BNG-4Port-1507803777936.json [moved from dashboard/Prox_BM_BNG-4Port-1506596922499.json with 83% similarity]
dashboard/Prox_BM_BNG-QoS-4Port-1507804267386.json [moved from dashboard/Prox_BM_BNG-QoS-4Port-1506596922499.json with 83% similarity]
dashboard/Prox_BM_L2FWD-2Port-1507804495722.json [moved from dashboard/Prox_BM_L2FWD-2Port-1501492823086.json with 78% similarity]
dashboard/Prox_BM_L2FWD-4Port-1507804504588.json [moved from dashboard/Prox_BM_L2FWD-4Port-1501498495048.json with 81% similarity]
dashboard/Prox_BM_L2FWD_Multiflow-2Port-1507803812868.json [moved from dashboard/Prox_BM_L2FWD_Multiflow-2Port-1501760631065.json with 80% similarity]
dashboard/Prox_BM_L2FWD_Multiflow-4Port-1507803820923.json [moved from dashboard/Prox_BM_L2FWD_Multiflow-4Port-1501760650413.json with 83% similarity]
dashboard/Prox_BM_L2FWD_Packet_Touch-2Port-1507803835253.json [moved from dashboard/Prox_BM_L2FWD_Packet_Touch_Test-2Port-1500472590269.json with 82% similarity]
dashboard/Prox_BM_L2FWD_Packet_Touch-4Port-1507803851310.json [moved from dashboard/Prox_BM_L2FWD_Packet_Touch_Test-4Port-1500472599088.json with 83% similarity]
dashboard/Prox_BM_L3FWD-2Port-1507803870940.json [moved from dashboard/Prox_BM_L3FWD-2Port-1500900469978.json with 81% similarity]
dashboard/Prox_BM_L3FWD-4Port-1507803878020.json [moved from dashboard/Prox_BM_L3FWD-4Port-1500900168552.json with 84% similarity]
dashboard/Prox_BM_LB_1to4-4Port-1507803887997.json [moved from dashboard/Prox_BM_LB_1to4-4Port-1501782362979.json with 83% similarity]
dashboard/Prox_BM_MPLS_tagging-2Port-1507803918014.json [moved from dashboard/Prox_BM_MPLS_tag_untag_Test-2Port-1500049478510.json with 79% similarity]
dashboard/Prox_BM_MPLS_tagging-4Port-1507803926523.json [moved from dashboard/Prox_BM_MPLS_tag_untag_Test-4Port-1500049362613.json with 82% similarity]
dashboard/Prox_BM_Packet_Buffering-1Port-1507803960476.json [moved from dashboard/Prox_BM_Packet_Buffering_Test-1Port-1501146963774.json with 72% similarity]
dashboard/Prox_BM_vPE-4Port-1507804058631.json [moved from dashboard/Prox_BM_vPE-4Port-1507195330973.json with 98% similarity]
dashboard/Prox_Heat_ACL-2Port-1507804110005.json [moved from dashboard/Prox_Heat_ACL_Test-2Port-1499778177265.json with 80% similarity]
dashboard/Prox_Heat_ACL-4Port-1507804119688.json [moved from dashboard/Prox_Heat_ACL_Test-4Port-1499778040281.json with 83% similarity]
dashboard/Prox_Heat_BNG-4Port-1507804128983.json [moved from dashboard/Prox_Heat_BNG-4Port-1506596971791.json with 83% similarity]
dashboard/Prox_Heat_BNG-QoS-4Port-1507804566403.json [moved from dashboard/Prox_Heat_BNG-QoS-4Port-1506596971791.json with 83% similarity]
dashboard/Prox_Heat_L2FWD-2Port-1507804575099.json [moved from dashboard/Prox_Heat_L2FWD-2Port-1501497403194.json with 80% similarity]
dashboard/Prox_Heat_L2FWD-4Port-1507804590601.json [moved from dashboard/Prox_Heat_L2FWD-4Port-1501497978548.json with 81% similarity]
dashboard/Prox_Heat_L2FWD_Multiflow-2Port-1507804713380.json [moved from dashboard/Prox_Heat_L2FWD_Multiflow-2Port-1501760607998.json with 80% similarity]
dashboard/Prox_Heat_L2FWD_Multiflow-4Port-1507804730174.json [moved from dashboard/Prox_Heat_L2FWD_Multiflow-4Port-1501761305237.json with 83% similarity]
dashboard/Prox_Heat_L2FWD_Packet_Touch-2Port-1507804789380.json [moved from dashboard/Prox_Heat_L2FWD_Packet_Touch_Test-2Port-1501090481325.json with 82% similarity]
dashboard/Prox_Heat_L2FWD_Packet_Touch-4Port-1507804802428.json [moved from dashboard/Prox_Heat_L2FWD_Packet_Touch_Test-4Port-1501090461715.json with 84% similarity]
dashboard/Prox_Heat_L3FWD-2Port-1507804811708.json [moved from dashboard/Prox_Heat_L3FWD-2Port-1501683503340.json with 80% similarity]
dashboard/Prox_Heat_L3FWD-4Port-1507804824268.json [moved from dashboard/Prox_Heat_L3FWD-4Port-1501683487964.json with 81% similarity]
dashboard/Prox_Heat_LB_1to4-4Port-1507804834019.json [moved from dashboard/Prox_Heat_LB_1to4-4Port-1505826034525.json with 83% similarity]
dashboard/Prox_Heat_MPLS_tagging-2Port-1507804851105.json [moved from dashboard/Prox_Heat_MPLS_tag_untag_Test-2Port-1501089144407.json with 82% similarity]
dashboard/Prox_Heat_MPLS_tagging-4Port-1507804858785.json [moved from dashboard/Prox_Heat_MPLS_tag_untag_Test-4Port-1501089128664.json with 83% similarity]
dashboard/Prox_Heat_Packet_Buffering-1Port-1507804872923.json [moved from dashboard/Prox_Heat_Packet_Buffering_Test-1Port-1501092616937.json with 72% similarity]
dashboard/Prox_Heat_vPE-4Port-1507804883050.json [moved from dashboard/Prox_Heat_vPE-4Port-1507195265889.json with 98% similarity]
docs/testing/user/userguide/04-installation.rst
docs/testing/user/userguide/opnfv_yardstick_tc044.rst
etc/yardstick/nodes/pod.yaml.collectd.sample
samples/vnf_samples/nsut/cgnapt/cgnat.cfg
samples/vnf_samples/nsut/prox/configs/gen_acl-4.cfg
tests/ci/yardstick-verify
tests/opnfv/test_cases/opnfv_yardstick_tc011.yaml
tests/unit/benchmark/scenarios/networking/test_iperf3.py
tests/unit/network_services/nfvi/test_resource.py
yardstick/benchmark/scenarios/networking/iperf3.py
yardstick/network_services/nfvi/collectd.conf
yardstick/network_services/nfvi/resource.py

index 7b82915..637c42d 100644 (file)
@@ -15,6 +15,7 @@
 - hosts: all
   vars:
     clone_dir: /tmp/yardstick-clone
+  environment: "{{ proxy_env|default({}) }}"
 
   roles:
     # needed for collectd plugins
index d4e91ac..9beaeb8 100644 (file)
@@ -1,4 +1,4 @@
 ---
 collectd_url: "https://github.com/collectd/collectd.git"
 collectd_dest: "{{ clone_dest }}/collectd"
-collectd_version: "47c86ace348a1d7a5352a83d10935209f89aa4f5"
+collectd_version: "c870991a2d614e51c03c0da76e9aef997343551b"
index d733e41..0c26770 100644 (file)
@@ -1,4 +1,4 @@
 ---
 intel_cmt_cat_url: "https://github.com/01org/intel-cmt-cat.git"
 intel_cmt_cat_dest: "{{ clone_dest }}/intel-cmt-cat"
-intel_cmt_cat_version: "master"
+intel_cmt_cat_version: "v1.1.0"
index 90dae66..3b164d1 100644 (file)
@@ -1,5 +1,5 @@
 ---
 pmu_tools_url: "https://github.com/andikleen/pmu-tools.git"
 pmu_tools_dest: "{{ clone_dest }}/pmu-tools"
-pmu_tools_version: "master"
+pmu_tools_version: "8a0417a90c3ec9a09264ae9364519f499e8975c1"
 perfmon_url: "https://download.01.org/perfmon/"
index 882fc50..8eda2cd 100755 (executable)
 # event_download.py         download for current cpu
 # event_download.py -a      download all
 # event_download.py cpustr...  Download for specific CPU
+from __future__ import absolute_import
+from __future__ import print_function
 import sys
+
 import re
-from urllib2 import urlopen, URLError
 import os
 import string
 from fnmatch import fnmatch
 from shutil import copyfile
 
+try:
+    from urllib2 import URLError
+except ImportError:
+    # python 3
+    from urllib.error import URLError
+
+
 urlpath = 'https://download.01.org/perfmon'
-localpath = 'download.01.org/perfmon'
+localpath = 'pmu_local_mirror/download.01.org/perfmon'
 mapfile = 'mapfile.csv'
 modelpath = localpath + "/" + mapfile
-NSB_JSON = '/opt/nsb_bin/pmu_event.json'
+NSB_JSON = os.environ.get("PMU_EVENTS_PATH", "/tmp/pmu_event.json")
+
 
 def get_cpustr():
-    f = open('/proc/cpuinfo', 'r')
-    cpu = [None, None, None]
-    for j in f:
-        n = j.split()
-        if n[0] == 'vendor_id':
-            cpu[0] = n[2]
-        elif n[0] == 'model' and n[1] == ':':
-            cpu[2] = int(n[2])
-        elif n[0] == 'cpu' and n[1] == 'family':
-            cpu[1] = int(n[3])
-        if all(cpu):
-            break
+    with open('/proc/cpuinfo', 'r') as f:
+        cpu = [None, None, None]
+        for j in f:
+            n = j.split()
+            if n[0] == 'vendor_id':
+                cpu[0] = n[2]
+            elif n[0] == 'model' and n[1] == ':':
+                cpu[2] = int(n[2])
+            elif n[0] == 'cpu' and n[1] == 'family':
+                cpu[1] = int(n[3])
+            if all(cpu):
+                break
     return "%s-%d-%X" % (cpu[0], cpu[1], cpu[2])
 
+
 def sanitize(s, a):
     o = ""
     for j in s:
@@ -52,13 +63,14 @@ def sanitize(s, a):
             o += j
     return o
 
+
 def getdir():
     try:
         d = os.getenv("XDG_CACHE_HOME")
         xd = d
         if not d:
             home = os.getenv("HOME")
-            d = "%s/.cache" % (home)
+            d = "%s/.cache" % home
         d += "/pmu-events"
         if not os.path.isdir(d):
             # try to handle the sudo case
@@ -73,11 +85,13 @@ def getdir():
     except OSError:
         raise Exception('Cannot access ' + d)
 
+
 NUM_TRIES = 3
 
+
 def getfile(url, dir, fn):
     tries = 0
-    print "Downloading", url, "to", fn
+    print("Downloading", url, "to", fn)
     while True:
         try:
             f = open(url)
@@ -86,15 +100,17 @@ def getfile(url, dir, fn):
             tries += 1
             if tries >= NUM_TRIES:
                 raise
-            print "retrying download"
+            print("retrying download")
             continue
         break
-    o = open(os.path.join(dir, fn), "w")
-    o.write(data)
-    o.close()
+    with open(os.path.join(dir, fn), "w") as o:
+        o.write(data)
     f.close()
 
+
 allowed_chars = string.ascii_letters + '_-.' + string.digits
+
+
 def download(match, key=None, link=True):
     found = 0
     dir = getdir()
@@ -105,14 +121,14 @@ def download(match, key=None, link=True):
             n = j.rstrip().split(",")
             if len(n) < 4:
                 if len(n) > 0:
-                    print "Cannot parse", n
+                    print("Cannot parse", n)
                 continue
             cpu, version, name, type = n
             if not fnmatch(cpu, match) or (key is not None and type not in key) or type.startswith("EventType"):
                 continue
             cpu = sanitize(cpu, allowed_chars)
             url = localpath + name
-           fn = "%s-%s.json" % (cpu, sanitize(type, allowed_chars))
+            fn = "%s-%s.json" % (cpu, sanitize(type, allowed_chars))
             try:
                 os.remove(os.path.join(dir, fn))
             except OSError:
@@ -128,34 +144,37 @@ def download(match, key=None, link=True):
                 try:
                     os.symlink(fn, os.path.join(dir, lname))
                 except OSError as e:
-                    print >>sys.stderr, "Cannot link %s to %s:" % (name, lname), e
+                    print("Cannot link %s to %s:" % (name, lname), e, file=sys.stderr)
             found += 1
         models.close()
         getfile(localpath + "/readme.txt", dir, "readme.txt")
     except URLError as e:
-        print >>sys.stderr, "Cannot access event server:", e
-        print >>sys.stderr, "If you need a proxy to access the internet please set it with:"
-        print >>sys.stderr, "\texport https_proxy=http://proxyname..."
-        print >>sys.stderr, "If you are not connected to the internet please run this on a connected system:"
-        print >>sys.stderr, "\tevent_download.py '%s'" % (match)
-        print >>sys.stderr, "and then copy ~/.cache/pmu-events to the system under test"
-        print >>sys.stderr, "To get events for all possible CPUs use:"
-        print >>sys.stderr, "\tevent_download.py -a"
+        print("Cannot access event server:", e, file=sys.stderr)
+        print("If you need a proxy to access the internet please set it with:", file=sys.stderr)
+        print("\texport https_proxy=http://proxyname...", file=sys.stderr)
+        print("If you are not connected to the internet please run this on a connected system:", file=sys.stderr)
+        print("\tevent_download.py '%s'" % match, file=sys.stderr)
+        print("and then copy ~/.cache/pmu-events to the system under test", file=sys.stderr)
+        print("To get events for all possible CPUs use:", file=sys.stderr)
+        print("\tevent_download.py -a", file=sys.stderr)
     except OSError as e:
-        print >>sys.stderr, "Cannot write events file:", e
+        print("Cannot write events file:", e, file=sys.stderr)
     return found
 
+
 def download_current(link=False):
     """Download JSON event list for current cpu.
        Returns >0 when a event list is found"""
     return download(get_cpustr(), link=link)
 
+
 def eventlist_name(name=None, key="core"):
     if not name:
         name = get_cpustr()
     cache = getdir()
     return "%s/%s-%s.json" % (cache, name, key)
 
+
 if __name__ == '__main__':
     # only import argparse when actually called from command line
     # this makes ocperf work on older python versions without it.
@@ -164,18 +183,19 @@ if __name__ == '__main__':
     p.add_argument('--all', '-a', help='Download all available event files', action='store_true')
     p.add_argument('--verbose', '-v', help='Be verbose', action='store_true')
     p.add_argument('--mine', help='Print name of current CPU', action='store_true')
-    p.add_argument('--link', help='Create links with the original event file name', action='store_true', default=True)
+    p.add_argument('--link', help='Create links with the original event file name',
+                   action='store_true', default=True)
     p.add_argument('cpus', help='CPU identifiers to download', nargs='*')
     args = p.parse_args()
 
     cpustr = get_cpustr()
     if args.verbose or args.mine:
-        print "My CPU", cpustr
+        print("My CPU", cpustr)
     if args.mine:
         sys.exit(0)
     d = getdir()
     if args.all:
-       found = download('*', link=args.link)
+        found = download('*', link=args.link)
     elif len(args.cpus) == 0:
         found = download_current(link=args.link)
     else:
@@ -184,10 +204,10 @@ if __name__ == '__main__':
             found += download(j, link=args.link)
 
     if found == 0:
-        print >>sys.stderr, "Nothing found"
+        print("Nothing found", file=sys.stderr)
 
     el = eventlist_name()
     if os.path.exists(el):
-        print "my event list", el 
-        copyfile(el,NSB_JSON)
-        print "File copied to ", NSB_JSON
+        print("my event list", el)
+        copyfile(el, NSB_JSON)
+        print("File copied to ", NSB_JSON)
index e78cc72..3ef4122 100644 (file)
     pmu_tools_path: "{{ pmu_tools_dest }}"
 
 - name: Create perfmon local mirror
-  command: "wget -mkEpnp {{ perfmon_url }} -P {{ pmu_tools_dest }}"
+  command: "wget -mkEpnp {{ perfmon_url }} -P {{ INSTALL_BIN_PATH }}/pmu_local_mirror"
   ignore_errors: yes
 
 - name: Copy local event download file
   copy:
     src: event_download_local.py
-    dest: "{{ pmu_tools_dest }}"
+    dest: "{{ INSTALL_BIN_PATH }}/event_download_local.py"
     owner: root
     group: root
     mode: 0755
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_ACL_Test-2Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "ACL",
-    "BM",
-    "2Port"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_ACL_2Port_Test</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_ACL_2Port_Test</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "ACL VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 ]
               ],
               "tags": []
+            }
+          ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
             },
             {
-              "alias": "TG Dropped Packets",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_baremetal_acl-2",
-              "policy": "default",
-              "refId": "B",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.DropPackets"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size and Drop Packets",
+          "title": "TG Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "ACL",
+    "BM",
+    "2Port"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "now/w",
     "to": "now"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 26,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_ACL-2Port",
+  "version": 4
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_ACL_Test-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "ACL",
-    "BM",
-    "4Port"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "25px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_ACL_4Port_Test</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_ACL_4Port_Test</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "height": "25",
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -75,7 +68,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "ACL VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 ]
               ],
               "tags": []
+            }
+          ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
             },
             {
-              "alias": "TG Dropped Packets",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_baremetal_acl-4",
-              "policy": "default",
-              "refId": "B",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.DropPackets"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
             }
           ],
           "timeFrom": null,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "ACL",
+    "BM",
+    "4Port"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-06-27T09:43:32.713Z",
-    "to": "2017-06-27T09:46:04.003Z"
+    "from": "2017-10-11T12:04:28.624Z",
+    "to": "2017-10-11T12:10:22.755Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 18,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_ACL-4Port",
+  "version": 5
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_BNG-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "4Port",
-    "BM",
-    "BNG"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
@@ -61,7 +55,6 @@
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "BNG VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets Out",
+              "label": "Packets",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets In",
+              "label": "Packets",
               "logBase": 1,
               "max": null,
               "min": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "bytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "4Port",
+    "BM",
+    "BNG"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-08-11T08:30:38.655Z",
     "to": "2017-08-11T08:33:45.419Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 8,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_BNG-4Port",
+  "version": 5
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_BNG-QoS-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "4Port",
-    "BM",
-    "BNG QoS"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_BNG-QoS_4Port_Test</center> </a></h5>\n<center>\n<p>The BNG+QoS workload converts packets from QinQ to GRE tunnels, handles routing, adds/removes MPLS tags and performs QoS</p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_BNG-QoS_4Port_Test</center> </a></h5>\n<center>\n<p>The BNG+QoS workload converts packets from QinQ to GRE tunnels, handles routing, adds/removes MPLS tags and performs QoS </p>\n<p>This use case simulates a realistic and complex application. The number of users is 32K per port and the number of routes is 8K</p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "BNG QoS VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets Out",
+              "label": "Packets",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets In",
+              "label": "Packets",
               "logBase": 1,
               "max": null,
               "min": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "bytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "4Port",
+    "BM",
+    "BNG QoS"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-08-11T08:30:38.655Z",
     "to": "2017-08-11T08:33:45.419Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 8,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_BNG-QoS-4Port",
+  "version": 5
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_L2FWD-2Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "BM",
-    "2Port"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_L2FWD_2Port_BM_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_L2FWD_2Port_BM_Test</center> </a></h5>\n<center>\n<p>The application does Port forwarding without touching packets. It will take packets in from one port and forward them unmodified to another port </p>\n<p>The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -73,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "L3Fwd VNF stats",
+          "title": "L2Fwd VNF stats",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 Out packets",
+              "alias": "TG xe-0 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 Out packets",
+              "alias": "TG xe-1 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 in packets",
+              "alias": "TG xe-0 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 in packets",
+              "alias": "TG xe-1 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen TX Throughput",
+              "alias": "TG TX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen RX Throughput",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen Tx vs Rx Throughput",
+          "title": "TG Tx vs Rx Throughput",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "bytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "BM",
+    "2Port",
+    "L2Fwd"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-11T13:40:37.452Z",
-    "to": "2017-07-11T13:42:24.186Z"
+    "from": "2017-10-03T09:39:42.199Z",
+    "to": "2017-10-03T09:47:01.687Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 5,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_L2FWD-2Port",
+  "version": 9
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_L2FWD-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "L2fwd",
-    "4Port",
-    "BM"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2FWD_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2FWD_4Port_Test</center> </a></h5>\n<center>\n<p>The application does Port forwarding without touching packets. It will take packets in from one port and forward them unmodified to another port </p>\n<p>The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "L2Fwd VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 Out packets",
+              "alias": "TG xe-0 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 Out packets",
+              "alias": "TG xe-1 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-2 Out packets",
+              "alias": "TG xe-2 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-3 Out packets",
+              "alias": "TG xe-3 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 in packets",
+              "alias": "TG xe-0 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 in packets",
+              "alias": "TG xe-1 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-2 in packets",
+              "alias": "TG xe-2 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-3 in packets",
+              "alias": "TG xe-3 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen TX Throughput",
+              "alias": "TG TX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen RX Throughput",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen Tx vs Rx Throughput",
+          "title": "TG Tx vs Rx Throughput",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "L2fwd",
+    "4Port",
+    "BM"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-31T10:48:35.874Z",
-    "to": "2017-07-31T10:50:34.033Z"
+    "from": "2017-10-02T08:41:16.579Z",
+    "to": "2017-10-02T08:58:57.509Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 1,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_L2FWD-4Port",
+  "version": 8
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_L2FWD_Multiflow-2Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "BM",
-    "2Port",
-    "L2FWD_Multiflow"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_L2FWD_Multiflow_2Port_BM_Test</center> </a></h5>\n<center>\n<p>This test allows to measures L2FWD with multiple flows (randomly generated src/dst  ip addresses). The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_L2FWD_Multiflow_2Port_BM_Test</center> </a></h5>\n<center>\n<p>This test allows to measures L2FWD with multiple flows (randomly generated src/dst  ip addresses). The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "L2Fwd Multiflow VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 Out packets",
+              "alias": "TG xe-0 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 Out packets",
+              "alias": "TG xe-1 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 in packets",
+              "alias": "TG xe-0 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 in packets",
+              "alias": "TG xe-1 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen TX Throughput",
+              "alias": "TG TX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen RX Throughput",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen Tx vs Rx Throughput",
+          "title": "TG Tx vs Rx Throughput",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "BM",
+    "2Port",
+    "L2FWD_Multiflow"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-08-03T10:00:17.289Z",
-    "to": "2017-08-03T10:02:23.481Z"
+    "from": "2017-09-29T13:57:22.710Z",
+    "to": "2017-09-29T14:04:48.839Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 5,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_L2FWD_Multiflow-2Port",
+  "version": 8
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_L2FWD_Multiflow-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "4Port",
-    "L2FWD_Multiflow",
-    "BM"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "25px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2FWD_Multiflow-4Port</center> </a></h5>\n<center>\n<p>This test measures L2FWD with multiple flows. (src/dst ip address are randomly generated)  The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2FWD_Multiflow-4Port</center> </a></h5>\n<center>\n<p>This test measures L2FWD with multiple flows. (src/dst ip address are randomly generated)  The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "height": "25",
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -75,7 +68,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "L2FWD Multiflow VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 ]
               ],
               "tags": []
+            }
+          ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
             },
             {
-              "alias": "TG Dropped Packets",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
-              "policy": "default",
-              "refId": "B",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.DropPackets"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size and Drop Packets",
+          "title": "Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "4Port",
+    "L2FWD_Multiflow",
+    "BM"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-08-03T10:26:14.359Z",
-    "to": "2017-08-03T10:28:43.436Z"
+    "from": "now/y",
+    "to": "now/y"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 8,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_L2FWD_Multiflow-4Port",
+  "version": 7
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_L2FWD_Packet_Touch_Test-2Port",
-  "tags": [
-    "NSB",
-    "Prox",
-    "BM",
-    "2Port",
-    "L2Fwd Packet Touch"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2Fwd_Packet_Touch_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2Fwd_Packet_Touch_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -73,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "VNF stats: Packet In, Forward and Dropped",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port stats: Out packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Throughput Stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size",
+          "title": "Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "NSB",
+    "Prox",
+    "BM",
+    "2Port",
+    "L2Fwd Packet Touch"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-07-19T13:01:50.468Z",
     "to": "2017-07-19T13:04:44.745Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 17,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_L2FWD_Packet_Touch-2Port",
+  "version": 5
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_L2FWD_Packet_Touch_Test-4Port",
-  "tags": [
-    "NSB",
-    "Prox",
-    "BM",
-    "4Port",
-    "L2Fwd packet touch"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2Fwd_Packet_Touch_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2Fwd_Packet_Touch_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -73,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "VNF stats: Packet In, Forward and Dropped",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: Out packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Throughput Stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size",
+          "title": "Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "NSB",
+    "Prox",
+    "BM",
+    "4Port",
+    "L2Fwd packet touch"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-19T13:49:40.514Z",
-    "to": "2017-07-19T13:51:37.781Z"
+    "from": "2017-09-29T13:38:49.432Z",
+    "to": "2017-09-29T13:46:53.369Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 7,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_L2FWD_Packet_Touch-4Port",
+  "version": 6
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_L3FWD-2Port",
-  "tags": [
-    "NSB",
-    "Prox",
-    "BM",
-    "L3Fwd",
-    "2Port"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L3Fwd_2Port_Test</center> </a></h5>\n<center>\n<p>The application performs routing of packets with LPM based look-up method.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L3Fwd_2Port_Test</center> </a></h5>\n<center>\n<p>The application performs routing of packets with LPM based look-up method.\nThe KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -73,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "VNF stats: Packet In, Forward and Dropped",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: Out packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Throughput Stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size",
+          "title": "Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "NSB",
+    "Prox",
+    "BM",
+    "L3Fwd",
+    "2Port"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-24T12:42:38.308Z",
-    "to": "2017-07-24T12:45:12.874Z"
+    "from": "2017-10-02T11:24:07.295Z",
+    "to": "2017-10-02T11:26:12.649Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 3,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_L3FWD-2Port",
+  "version": 4
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_L3FWD-4Port",
-  "tags": [
-    "NSB",
-    "Prox",
-    "BM",
-    "4Port",
-    "L3Fwd"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L3Fwd_4Port_Test</center> </a></h5>\n<center>\n<p>The application performs routing of packets with LPM based look-up method.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L3Fwd_4Port_Test</center> </a></h5>\n<center>\n<p>The application performs routing of packets with LPM based look-up method.\nThe KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -73,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "VNF stats: Packet In, Forward and Dropped",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: Out packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Throughput Stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size",
+          "title": "Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "NSB",
+    "Prox",
+    "BM",
+    "4Port",
+    "L3Fwd"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-24T11:06:05.950Z",
-    "to": "2017-07-24T11:09:07.902Z"
+    "from": "2017-09-29T14:12:51.977Z",
+    "to": "2017-09-29T14:19:29.296Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 4,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_L3FWD-4Port",
+  "version": 4
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_LB_1to4-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "4Port",
-    "BM",
-    "LB"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "25px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_LB_1to4Port</center> </a></h5>\n<center>\n<p>This transmits random packets on 1 port, and received them on 4 ports. The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_LB_1to4Port</center> </a></h5>\n<center>\n<p>This transmits random packets on 1 port, and received them on 4 ports. The KPI is the number of packets per second with an accepted minimal packet loss for a specified packet size</p>\n</center>",
           "editable": true,
           "error": false,
           "height": "25",
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -75,7 +68,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
-        {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 22px '#31A7D3'\"><center>Prox Load Balancer Traffic Gen stats</center> </a></h5>\n",
-          "editable": true,
-          "error": false,
-          "height": "40",
-          "id": 8,
-          "isNew": true,
-          "links": [],
-          "mode": "html",
-          "span": 12,
-          "title": "",
-          "type": "text"
-        },
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 10,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
             "max": true,
             "min": true,
             "rightSide": false,
-            "show": false,
+            "show": true,
             "total": false,
             "values": true
           },
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Load Balancer VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
+        {
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 22px '#31A7D3'\"><center>Prox Load Balancer Traffic Gen stats</center> </a></h5>\n",
+          "editable": true,
+          "error": false,
+          "height": "40",
+          "id": 8,
+          "links": [],
+          "mode": "html",
+          "span": 12,
+          "title": "",
+          "type": "text"
+        },
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 ]
               ],
               "tags": []
+            }
+          ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
             },
             {
-              "alias": "TG Dropped Packets",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_baremetal_lb-4",
-              "policy": "default",
-              "refId": "B",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.DropPackets"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size and Drop Packets",
+          "title": "TG Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "4Port",
+    "BM",
+    "LB"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-08-03T17:29:12.741Z",
-    "to": "2017-08-03T17:30:59.111Z"
+    "from": "2017-10-10T13:42:45.059Z",
+    "to": "2017-10-10T13:48:35.750Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 4,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_LB_1to4-4Port",
+  "version": 10
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_MPLS_tag_untag_Test-2Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "BM",
-    "MPLS",
-    "2Port"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_MPLS_Tag_Untag_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and  forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for 68 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_MPLS_Tagging_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and  forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for a specified packet size ( min packet size is 68 byte) with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "MPLS VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: Out packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 [
                   {
                     "params": [
-                      "tg__0.xe0.in_packets"
+                      "tg__0.xe1.in_packets"
                     ],
                     "type": "field"
                   },
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Throughput Stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "BM",
+    "MPLS",
+    "2Port"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-14T10:36:36.944Z",
-    "to": "2017-07-14T10:39:35.738Z"
+    "from": "2017-09-28T15:52:05.857Z",
+    "to": "2017-09-28T16:12:48.623Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 2,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_MPLS_tagging-2Port",
+  "version": 8
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_MPLS_tag_untag_Test-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "BM",
-    "4Port",
-    "MPLS"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_MPLS_Tag_Untag_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and  forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for 68 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_MPLS_Tagging_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and  forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for a specified packet size ( min packet size is 68 byte) with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "MPLS VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats:  Out packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Throughput Stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "BM",
+    "4Port",
+    "MPLS"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-10T18:44:50.858Z",
-    "to": "2017-07-10T18:52:56.422Z"
+    "from": "2017-09-28T16:20:28.692Z",
+    "to": "2017-09-28T16:22:45.584Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 7,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_MPLS_tagging-4Port",
+  "version": 5
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_Packet_Buffering_Test-1Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "BM",
-    "Buffering",
-    "1Port"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_Buffering_1Port_Test</center> </a></h5>\n<center>\n<p>The KPI in this test is the maximum number of packets that can be forwarded\n    given the requirement that the latency of each packet is at least\n    125 millisecond</p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_Buffering_1Port_Test</center> </a></h5>\n<center>\n<p>This test measures the impact of the condition when packets get buffered, thus they stay in memory for the extended period of time.</p>\n<p>The KPI in this test is the maximum number of packets that can be forwarded given the requirement that the latency of each packet is at least 125 millisecond</p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet Buffering  VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port stats: Out vs In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
-          "id": 9,
-          "isNew": true,
+          "grid": {},
+          "id": 2,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Min Latency",
+              "alias": "TG TX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 [
                   {
                     "params": [
-                      "tg__0.LatencyMin.2"
+                      "tg__0.Throughput"
                     ],
                     "type": "field"
                   },
               "tags": []
             },
             {
-              "alias": "Avg Latency",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 [
                   {
                     "params": [
-                      "tg__0.LatencyAvg.2"
+                      "tg__0.RxThroughput"
                     ],
                     "type": "field"
                   },
                 ]
               ],
               "tags": []
+            }
+          ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
             },
             {
-              "alias": "Max Latency",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_baremetal_buffering-1",
-              "policy": "default",
-              "refId": "C",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.LatencyMax.2"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Latency stats",
+          "title": "TG Throughput Stats",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
               "format": "short",
-              "label": "Latency",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
-          "id": 2,
-          "isNew": true,
+          "grid": {},
+          "id": 5,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "TG TX Throughput",
+              "alias": "TG Packet Size",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 [
                   {
                     "params": [
-                      "tg__0.Throughput"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
-            },
-            {
-              "alias": "TG RX Throughput",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_baremetal_buffering-1",
-              "policy": "default",
-              "refId": "B",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.RxThroughput"
+                      "tg__0.PktSize"
                     ],
                     "type": "field"
                   },
               "tags": []
             }
           ],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "TG Throughput Stats",
-          "tooltip": {
-            "msResolution": true,
-            "shared": true,
-            "sort": 0,
-            "value_type": "cumulative"
-          },
-          "type": "graph",
-          "xaxis": {
-            "show": true
-          },
-          "yaxes": [
+          "thresholds": [
             {
-              "format": "pps",
-              "label": "Throughput",
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
             },
             {
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            }
-          ]
-        },
-        {
-          "aliasColors": {},
-          "bars": false,
-          "datasource": "${DS_YARDSTICK}",
-          "editable": true,
-          "error": false,
-          "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
-          "id": 5,
-          "isNew": true,
-          "legend": {
-            "alignAsTable": true,
-            "avg": true,
-            "current": false,
-            "max": true,
-            "min": true,
-            "show": true,
-            "total": false,
-            "values": true
-          },
-          "lines": true,
-          "linewidth": 2,
-          "links": [],
-          "nullPointMode": "connected",
-          "percentage": false,
-          "pointradius": 5,
-          "points": false,
-          "renderer": "flot",
-          "seriesOverrides": [],
-          "span": 6,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "alias": "TG Packet Size",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_baremetal_buffering-1",
-              "policy": "default",
-              "refId": "A",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.PktSize"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
             }
           ],
           "timeFrom": null,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "BM",
+    "Buffering",
+    "1Port"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-14T15:56:09.546Z",
-    "to": "2017-07-14T15:59:17.008Z"
+    "from": "2017-10-10T16:10:20.580Z",
+    "to": "2017-10-10T16:16:35.111Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 8,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_Packet_Buffering-1Port",
+  "version": 7
 }
\ No newline at end of file
@@ -51,7 +51,7 @@
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_vPE_4Port_Test</center> </a></h5>\n<center>\n<p>The vPE handles packet processing, routing, QinQ encapsulation, flows, ACL rules, adds/removes MPLS tags and performs QoS </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_vPE_4Port_Test</center> </a></h5>\n<center>\n<p>The vPE handles packet processing, routing, QinQ encapsulation, flows, ACL rules, adds/removes MPLS tags and performs QoS </p>\n<p>The KPI is the number of packets per second for a specified packet size (min packet size is 68 byte) with an accepted minimal packet loss</p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats:  Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets Out",
+              "label": "Packets ",
               "logBase": 1,
               "max": null,
               "min": null,
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets In",
+              "label": "Packets ",
               "logBase": 1,
               "max": null,
               "min": null,
     "list": []
   },
   "time": {
-    "from": "2017-10-04T10:48:59.715Z",
-    "to": "2017-10-04T10:56:46.895Z"
+    "from": "2017-10-09T11:05:30.701Z",
+    "to": "2017-10-09T11:11:21.952Z"
   },
   "timepicker": {
     "refresh_intervals": [
   },
   "timezone": "browser",
   "title": "Prox_BM_vPE-4Port",
-  "version": 6
+  "version": 10
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_ACL_Test-2Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "ACL",
-    "Heat",
-    "2Port"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "25px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_ACL_Heat_Test-2Port</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_ACL_Test-2Port</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "height": "25",
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -75,7 +68,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "ACL VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 ]
               ],
               "tags": []
+            }
+          ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
             },
             {
-              "policy": "default",
-              "dsType": "influxdb",
-              "resultFormat": "time_series",
-              "tags": [],
-              "groupBy": [
-                {
-                  "type": "time",
-                  "params": [
-                    "$interval"
-                  ]
-                },
-                {
-                  "type": "fill",
-                  "params": [
-                    "null"
-                  ]
-                }
-              ],
-              "select": [
-                [
-                  {
-                    "type": "field",
-                    "params": [
-                      "tg__0.DropPackets"
-                    ]
-                  },
-                  {
-                    "type": "mean",
-                    "params": []
-                  }
-                ]
-              ],
-              "refId": "B",
-              "measurement": "tc_prox_heat_context_acl-2",
-              "alias": "TG Dropped Packets"
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size and Drop Packets",
+          "title": "TG Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
+    },
+    {
+      "collapse": false,
+      "height": 250,
+      "panels": [],
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Dashboard Row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "ACL",
+    "Heat",
+    "2Port"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-07T15:33:56.340Z",
-    "to": "2017-07-07T15:36:11.941Z"
+    "from": "2017-10-11T15:30:57.312Z",
+    "to": "2017-10-11T15:38:33.455Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 7,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_ACL-2Port",
+  "version": 5
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_ACL_Test-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "ACL",
-    "Heat",
-    "4Port"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "25px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_ACL_Test-4Port</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_ACL_Test-4Port</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "height": "25",
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -75,7 +68,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "ACL VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 ]
               ],
               "tags": []
+            }
+          ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
             },
             {
-              "alias": "TG Dropped Packets",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_heat_context_acl-4",
-              "policy": "default",
-              "refId": "B",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.DropPackets"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size and Drop Packets",
+          "title": "TG Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "ACL",
+    "Heat",
+    "4Port"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-07-07T15:00:35.628Z",
     "to": "2017-07-07T17:54:24.315Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 12,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_ACL-4Port",
+  "version": 4
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_BNG-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "4Port",
-    "BNG",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
@@ -61,7 +55,6 @@
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "BNG VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "4Port",
+    "BNG",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-09-12T15:44:08.523Z",
     "to": "2017-09-12T15:49:33.638Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 4,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_BNG-4Port",
+  "version": 3
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_BNG-QoS-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "4Port",
-    "BNG QoS",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_BNG-QoS_4Port_Test</center> </a></h5>\n<center>\n<p>The BNG+QoS workload converts packets from QinQ to GRE tunnels, handles routing, adds/removes MPLS tags and performs QoS</p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_BNG-QoS_4Port_Test</center> </a></h5>\n<center>\n<p>The BNG+QoS workload converts packets from QinQ to GRE tunnels, handles routing, adds/removes MPLS tags and performs QoS </p>\n<p>This use case simulates a realistic and complex application. The number of users is 32K per port and the number of routes is 8K</p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "BNG QoS VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets Out",
+              "label": "Packets ",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets In",
+              "label": "Packets",
               "logBase": 1,
               "max": null,
               "min": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "4Port",
+    "BNG QoS",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-09-12T15:44:08.523Z",
-    "to": "2017-09-12T15:49:33.638Z"
+    "from": "2017-10-04T14:48:46.365Z",
+    "to": "2017-10-04T15:52:41.999Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 4,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_BNG-QoS-4Port",
+  "version": 4
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_L2FWD-2Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "2Port",
-    "Heat",
-    "L2fwd"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2FWD_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2FWD_2Port_Test</center> </a></h5>\n<center>\n<p>The application does Port forwarding without touching packets. It will take packets in from one port and forward them unmodified to another port </p>\n<p>The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "L2Fwd VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
             "max": true,
             "min": true,
             "show": true,
+            "sortDesc": true,
             "total": false,
             "values": true
           },
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Tgen Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "2Port",
+    "Heat",
+    "L2fwd"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-31T09:13:44.495Z",
-    "to": "2017-07-31T09:16:49.248Z"
+    "from": "2017-10-03T09:54:49.531Z",
+    "to": "2017-10-03T10:00:54.659Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 3,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_L2FWD-2Port",
+  "version": 7
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_L2FWD-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "Heat",
-    "L2fwd",
-    "4Port"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2FWD_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2FWD_4Port_Test</center> </a></h5>\n<center>\n<p>The application does Port forwarding without touching packets. It will take packets in from one port and forward them unmodified to another port </p>\n<p>The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "L2Fwd VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 Out packets",
+              "alias": "TG xe-0 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 Out packets",
+              "alias": "TG xe-1 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-2 Out packets",
+              "alias": "TG xe-2 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-3 Out packets",
+              "alias": "TG xe-3 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 in packets",
+              "alias": "TG xe-0 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 in packets",
+              "alias": "TG xe-1 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-2 in packets",
+              "alias": "TG xe-2 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-3 in packets",
+              "alias": "TG xe-3 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen TX Throughput",
+              "alias": "TG TX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen RX Throughput",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen Tx vs Rx Throughput",
+          "title": "TG Tx vs Rx Throughput",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "Heat",
+    "L2fwd",
+    "4Port"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-31T10:37:09.211Z",
-    "to": "2017-07-31T10:39:16.625Z"
+    "from": "2017-10-09T15:07:30.493Z",
+    "to": "2017-10-09T15:12:46.910Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 2,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_L2FWD-4Port",
+  "version": 5
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_L2FWD_Multiflow-2Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "2Port",
-    "Heat",
-    "L2FWD_Multiflow"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_L2FWD_Multiflow_2Port_Heat_Test</center> </a></h5>\n<center>\n<p>This test allows to measures L2FWD with multiple flows (randomly generated src/dst  ip addresses). The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2FWD_Multiflow_2Port_Test</center> </a></h5>\n<center>\n<p>This test allows to measures L2FWD with multiple flows (randomly generated src/dst  ip addresses). The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "L2Fwd Multiflow VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 Out packets",
+              "alias": "TG xe-0 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 Out packets",
+              "alias": "TG xe-1 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 in packets",
+              "alias": "TG xe-0 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 in packets",
+              "alias": "TG xe-1 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen TX Throughput",
+              "alias": "TG TX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen RX Throughput",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen Tx vs Rx Throughput",
+          "title": "TG Tx vs Rx Throughput",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "2Port",
+    "Heat",
+    "L2FWD_Multiflow"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-08-03T11:34:41.442Z",
     "to": "2017-08-03T11:36:40.434Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 3,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_L2FWD_Multiflow-2Port",
+  "version": 4
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_L2FWD_Multiflow-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "4Port",
-    "L2FWD_Multiflow",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "25px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2FWD_Multiflow-4Port</center> </a></h5>\n<center>\n<p>This test measures L2FWD with multiple flows. (src/dst ip address are randomly generated)  The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2FWD_Multiflow_4Port_Test</center> </a></h5>\n<center>\n<p>This test measures L2FWD with multiple flows. (src/dst ip address are randomly generated)  The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "height": "25",
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -75,7 +68,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "L2FWD Multiflow VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l3fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 ]
               ],
               "tags": []
+            }
+          ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
             },
             {
-              "alias": "TG Dropped Packets",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
-              "policy": "default",
-              "refId": "B",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.DropPackets"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size and Drop Packets",
+          "title": "TG Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "4Port",
+    "L2FWD_Multiflow",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-08-03T11:46:53.873Z",
     "to": "2017-08-03T11:48:46.478Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 2,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_L2FWD_Multiflow-4Port",
+  "version": 5
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_L2FWD_Packet_Touch_Test-2Port",
-  "tags": [
-    "NSB",
-    "Prox",
-    "2Port",
-    "L2Fwd Packet Touch",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2Fwd_Packet_Touch_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2Fwd_Packet_Touch_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -73,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "VNF stats: Packet In, Forward and Dropped",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port stats: Out packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_pktTouch-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_pktTouch-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Throughput Stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_pktTouch-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "bytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "NSB",
+    "Prox",
+    "2Port",
+    "L2Fwd Packet Touch",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-25T14:36:56.312Z",
-    "to": "2017-07-25T14:47:31.476Z"
+    "from": "2017-10-03T10:14:05.964Z",
+    "to": "2017-10-03T10:20:38.843Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 2,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_L2FWD_Packet_Touch-2Port",
+  "version": 5
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_L2FWD_Packet_Touch_Test-4Port",
-  "tags": [
-    "NSB",
-    "Prox",
-    "4Port",
-    "L2Fwd packet touch",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
@@ -60,7 +55,6 @@
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -73,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "VNF stats: Packet In, Forward and Dropped",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: Out packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Throughput Stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "NSB",
+    "Prox",
+    "4Port",
+    "L2Fwd packet touch",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-26T17:27:26.963Z",
-    "to": "2017-07-26T17:30:56.567Z"
+    "from": "now/y",
+    "to": "now/y"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 1,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_L2FWD_Packet_Touch-4Port",
+  "version": 3
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_L3FWD-2Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "L3Fwd",
-    "2Port",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L3FWD_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L3FWD_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "L3Fwd VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 Out packets",
+              "alias": "TG xe-0 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 Out packets",
+              "alias": "TG xe-1 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 in packets",
+              "alias": "TG xe-0 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 in packets",
+              "alias": "TG xe-1 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen TX Throughput",
+              "alias": "TG TX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen RX Throughput",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen Tx vs Rx Throughput",
+          "title": "TG Tx vs Rx Throughput",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "L3Fwd",
+    "2Port",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-07-28T17:04:13.512Z",
     "to": "2017-07-28T17:13:15.023Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 4,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_L3FWD-2Port",
+  "version": 3
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_L3FWD-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "L3Fwd",
-    "4Port",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L3FWD_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L3FWD_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "L3Fwd VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 Out packets",
+              "alias": "TG xe-0 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 Out packets",
+              "alias": "TG xe-1 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-2 Out packets",
+              "alias": "TG xe-2 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-3 Out packets",
+              "alias": "TG xe-3 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 in packets",
+              "alias": "TG xe-0 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 in packets",
+              "alias": "TG xe-1 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-2 in packets",
+              "alias": "TG xe-2 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-3 in packets",
+              "alias": "TG xe-3 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen TX Throughput",
+              "alias": "TG TX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen RX Throughput",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen Tx vs Rx Throughput",
+          "title": "TG Tx vs Rx Throughput",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "L3Fwd",
+    "4Port",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-08-02T13:52:27.313Z",
     "to": "2017-08-02T13:54:35.713Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 3,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_L3FWD-4Port",
+  "version": 4
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_LB_1to4-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "4Port",
-    "LB",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "25px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_LB_1to4Port</center> </a></h5>\n<center>\n<p>This transmits random packets on 1 port, and received them on 4 ports. The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_LB_1to4Port</center> </a></h5>\n<center>\n<p>This transmits random packets on 1 port, and received them on 4 ports. The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "height": "25",
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -75,7 +68,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
-        {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 22px '#31A7D3'\"><center>Prox Load Balancer Traffic Gen stats</center> </a></h5>\n",
-          "editable": true,
-          "error": false,
-          "height": "40",
-          "id": 8,
-          "isNew": true,
-          "links": [],
-          "mode": "html",
-          "span": 12,
-          "title": "",
-          "type": "text"
-        },
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 10,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
             "max": true,
             "min": true,
             "rightSide": false,
-            "show": false,
+            "show": true,
             "total": false,
             "values": true
           },
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Load Balancer VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
+        {
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 22px '#31A7D3'\"><center>Prox Load Balancer Traffic Gen stats</center> </a></h5>\n",
+          "editable": true,
+          "error": false,
+          "height": "40",
+          "id": 8,
+          "links": [],
+          "mode": "html",
+          "span": 12,
+          "title": "",
+          "type": "text"
+        },
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                   "type": "fill"
                 }
               ],
-              "measurement": "tc_prox_baremetal_lb-4",
+              "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 ]
               ],
               "tags": []
+            }
+          ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
             },
             {
-              "alias": "TG Dropped Packets",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_heat_context_lb-4",
-              "policy": "default",
-              "refId": "B",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.DropPackets"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size and Drop Packets",
+          "title": "TG Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "4Port",
+    "LB",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-09-19T12:39:56.933Z",
-    "to": "2017-09-19T12:46:07.167Z"
+    "from": "2017-10-10T13:21:20.290Z",
+    "to": "2017-10-10T13:33:42.920Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 4,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_LB_1to4-4Port",
+  "version": 7
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_MPLS_tag_untag_Test-2Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "MPLS",
-    "2Port",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_MPLS_Tag_Untag_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and  forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for 68 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_MPLS_Tag_Untag_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and  forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for a specified packet size ( min packet size is 68 byte) with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "MPLS VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: Out packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Throughput Stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "MPLS",
+    "2Port",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-07-26T16:44:35.417Z",
     "to": "2017-07-26T16:48:07.816Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 1,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_MPLS_tagging-2Port",
+  "version": 5
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_MPLS_tag_untag_Test-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "4Port",
-    "MPLS",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_MPLS_Tag_Untag_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and  forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for 68 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_MPLS_Tagging_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and  forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for a specified packet size ( min packet size is 68 byte) with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "MPLS VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats:  Out packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Throughput Stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "4Port",
+    "MPLS",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-07-26T17:04:06.296Z",
     "to": "2017-07-26T17:06:02.094Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 2,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_MPLS_tagging-4Port",
+  "version": 3
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_Packet_Buffering_Test-1Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "Buffering",
-    "1Port",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_Buffering_1Port_Test</center> </a></h5>\n<center>\n<p>The KPI in this test is the maximum number of packets that can be forwarded\n    given the requirement that the latency of each packet is at least\n    125 millisecond</p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_Buffering_1Port_Test</center> </a></h5>\n<center>\n<p>This test measures the impact of the condition when packets get buffered, thus they stay in memory for the extended period of time.</p>\n<p>The KPI in this test is the maximum number of packets that can be forwarded given the requirement that the latency of each packet is at least 125 millisecond</p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet Buffering VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 Out packets",
+              "alias": "TG xe-0 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-0 In packets",
+              "alias": "TG xe-0 In packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port stats: Out vs In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
-          "id": 9,
-          "isNew": true,
+          "grid": {},
+          "id": 2,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Min Latency",
+              "alias": "TG TX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 [
                   {
                     "params": [
-                      "tg__0.LatencyMin.2"
+                      "tg__0.Throughput"
                     ],
                     "type": "field"
                   },
               "tags": []
             },
             {
-              "alias": "Avg Latency",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 [
                   {
                     "params": [
-                      "tg__0.LatencyAvg.2"
+                      "tg__0.RxThroughput"
                     ],
                     "type": "field"
                   },
                 ]
               ],
               "tags": []
+            }
+          ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
             },
             {
-              "alias": "Max Latency",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_heat_context_buffering-1",
-              "policy": "default",
-              "refId": "C",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.LatencyMax.2"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Latency stats",
+          "title": "TG TX vs RX Throughput",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
               "format": "short",
-              "label": "Latency",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
-          "id": 2,
-          "isNew": true,
+          "grid": {},
+          "id": 5,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "TG TX Throughput",
+              "alias": "TG Packet Size",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 [
                   {
                     "params": [
-                      "tg__0.Throughput"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
-            },
-            {
-              "alias": "TG RX Throughput",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_heat_context_buffering-1",
-              "policy": "default",
-              "refId": "B",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.RxThroughput"
+                      "tg__0.PktSize"
                     ],
                     "type": "field"
                   },
               "tags": []
             }
           ],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "TG Throughput Stats",
-          "tooltip": {
-            "msResolution": true,
-            "shared": true,
-            "sort": 0,
-            "value_type": "cumulative"
-          },
-          "type": "graph",
-          "xaxis": {
-            "show": true
-          },
-          "yaxes": [
+          "thresholds": [
             {
-              "format": "pps",
-              "label": "Throughput",
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
             },
             {
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            }
-          ]
-        },
-        {
-          "aliasColors": {},
-          "bars": false,
-          "datasource": "${DS_YARDSTICK}",
-          "editable": true,
-          "error": false,
-          "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
-          "id": 5,
-          "isNew": true,
-          "legend": {
-            "alignAsTable": true,
-            "avg": true,
-            "current": false,
-            "max": true,
-            "min": true,
-            "show": true,
-            "total": false,
-            "values": true
-          },
-          "lines": true,
-          "linewidth": 2,
-          "links": [],
-          "nullPointMode": "connected",
-          "percentage": false,
-          "pointradius": 5,
-          "points": false,
-          "renderer": "flot",
-          "seriesOverrides": [],
-          "span": 6,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "alias": "TG Packet Size",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_heat_context_buffering-1",
-              "policy": "default",
-              "refId": "A",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.PktSize"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
             }
           ],
           "timeFrom": null,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "Buffering",
+    "1Port",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-26T18:07:01.703Z",
-    "to": "2017-07-26T18:09:21.972Z"
+    "from": "2017-10-10T16:20:59.131Z",
+    "to": "2017-10-10T16:28:03.341Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 4,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_Packet_Buffering-1Port",
+  "version": 4
 }
\ No newline at end of file
@@ -51,7 +51,7 @@
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_vPE_4Port_Test</center> </a></h5>\n<center>\n<p>The vPE handles packet processing, routing, QinQ encapsulation, flows, ACL rules, adds/removes MPLS tags and performs QoS </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_vPE_4Port_Test</center> </a></h5>\n<center>\n<p>The vPE handles packet processing, routing, QinQ encapsulation, flows, ACL rules, adds/removes MPLS tags and performs QoS </p>\n<p>The KPI is the number of packets per second for a specified packet size (min packet size is 68 byte) with an accepted minimal packet loss</p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets Out",
+              "label": "Packets",
               "logBase": 1,
               "max": null,
               "min": null,
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets In",
+              "label": "Packets",
               "logBase": 1,
               "max": null,
               "min": null,
     "list": []
   },
   "time": {
-    "from": "2017-10-04T11:02:07.286Z",
-    "to": "2017-10-04T11:10:20.389Z"
+    "from": "2017-10-09T10:53:53.915Z",
+    "to": "2017-10-09T11:00:04.248Z"
   },
   "timepicker": {
     "refresh_intervals": [
   },
   "timezone": "browser",
   "title": "Prox_Heat_vPE-4Port",
-  "version": 8
+  "version": 12
 }
\ No newline at end of file
index cb4f314..b40e114 100644 (file)
@@ -82,7 +82,7 @@ following docker command::
 
 Run the Docker image to get a Yardstick container::
 
-  docker run -itd --privileged -v /var/run/docker.sock:/var/run/docker.sock -p 8888:5000 -e INSTALLER_IP=192.168.200.2 -e INSTALLER_TYPE=compass --name yardstick opnfv/yardstick:stable
+  docker run -itd --privileged -v /var/run/docker.sock:/var/run/docker.sock -p 8888:5000 --name yardstick opnfv/yardstick:stable
 
 Note:
 
@@ -101,21 +101,6 @@ Note:
 |                                              | Yardstick container, this    |
 |                                              | parameter is needed.         |
 +----------------------------------------------+------------------------------+
-| -e INSTALLER_IP=192.168.200.2                | If you want to use yardstick |
-|                                              | env prepare command(or       |
-| -e INSTALLER_TYPE=compass                    | related API) to load the     |
-|                                              | images that Yardstick needs, |
-|                                              | these parameters should be   |
-|                                              | provided.                    |
-|                                              | The INSTALLER_IP and         |
-|                                              | INSTALLER_TYPE are depending |
-|                                              | on your OpenStack installer. |
-|                                              | Currently Apex, Compass,     |
-|                                              | Fuel and Joid are supported. |
-|                                              | If you use other installers, |
-|                                              | such as devstack, these      |
-|                                              | parameters can be ignores.   |
-+----------------------------------------------+------------------------------+
 | -p 8888:5000                                 | If you want to call          |
 |                                              | Yardstick API out of         |
 |                                              | Yardstick container, this    |
@@ -149,11 +134,11 @@ In the Yardstick container, the Yardstick repository is located in the ``/home/o
 
   yardstick env prepare
 
-**NOTE**: The above command works for four OPNFV installers -- **Apex**, **Compass**, **Fuel** and **Joid**.
-For Non-OPNFV installer OpenStack environment, the above command can also be used to configure the environment.
-But before running the above command in a Non-OPNFV installer environment, it is necessary to create the /etc/yardstick/openstack.creds file and
-save OpenStack environment variables in it. For details of the required OpenStack environment variables please refer to
-section **Export OpenStack environment variables**
+**NOTE**: Since Euphrates release, the above command will not able to automatically configure the /etc/yardstick/openstack.creds file.
+So before running the above command, it is necessary to create the /etc/yardstick/openstack.creds file and save OpenStack environment variables into it manually.
+If you have the openstack credential file saved outside the Yardstcik Docker container, you can do this easily by mapping the credential file into Yardstick container
+ using '-v /path/to/credential_file:/etc/yardstick/openstack.creds' when running the Yardstick container.
+For details of the required OpenStack environment variables please refer to section **Export OpenStack environment variables**
 
 The env prepare command may take up to 6-8 minutes to finish building
 yardstick-image and other environment preparation. Meanwhile if you wish to
@@ -647,4 +632,5 @@ yaml file and add test cases, constraint or task arguments if necessary.
 
 
 Proxy Support (**Todo**)
----------------------------
\ No newline at end of file
+---------------------------
+
index 2be8517..8db45e1 100644 (file)
@@ -7,7 +7,7 @@
 Yardstick Test Case Description TC044
 *************************************
 
-.. _man-pages: http://manpages.ubuntu.com/manpages/trusty/en/man1/free.1.html
+.. _man-pages: http://manpages.ubuntu.com/manpages/xenial/en/man1/free.1.html
 
 +-----------------------------------------------------------------------------+
 |Memory Utilization                                                           |
index 6ebf9e2..aae677c 100644 (file)
@@ -21,5 +21,9 @@ nodes:
     password: r00t
     collectd:
         interval: 5
-        plugins:
-            ovs_stats: {}
+#        plugins:
+#            intel_rdt: {}
+#            virt: {}
+#            ovs_stats:
+#                ovs_socket_path: /var/run/openvswitch/db.sock
+#            intel_pmu: {}
index 394f4ad..37c5e27 100644 (file)
@@ -76,8 +76,6 @@ timer_period = 10000
 max_clients_per_ip = 65535
 max_port_per_client = 100
 public_ip_port_range = 04040000:(1, 65535)
-public_ip_port_range = 04040001:(1, 65535)
-public_ip_port_range = 04040002:(1, 65535)
 vnf_set = (3,4,5)
 pkt_type = ipv4
 cgnapt_meta_offset = 128
index 49cf29c..bcfdb50 100644 (file)
@@ -115,7 +115,7 @@ rand_offset=42
 name=p2
 task=0
 mode=gen
-tx port=p1
+tx port=p2
 bps=625000000
 ; Ethernet + QinQ + IP + UDP
 pkt inline=${sut_mac2} 70 00 00 00 00 02 ${qinq_tag_inline} 00 01 81 00 00 01 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d c0 a8 01 01 c0 a8 01 01 00 35 00 35 00 08 7c 21  FFFFFFFF
index f3e7a49..d117482 100755 (executable)
@@ -209,10 +209,10 @@ EOF
 
 
 
-        local scenario_status="SUCCESS"
+        local scenario_status="PASS"
 
         if [ $failed -gt 0 ]; then
-            scenario_status="FAILED"
+            scenario_status="FAIL"
         fi
 
         report "${scenario_status}" "${start_date}" "${stop_date}"
index b2077d5..ee36c6c 100644 (file)
@@ -13,7 +13,7 @@ description: >
     Yardstick TC011 config file;
     Measure packet delay variation (jitter) using iperf3.
 
-{% set udp = udp or "udp" %}
+{% set protocol = protocol or "udp" %}
 {% set bandwidth = bandwidth or "20m" %}
 {% set length = length or "8K" %}
 {% set window = window or 29200 %}
@@ -25,7 +25,7 @@ scenarios:
 -
   type: Iperf3
   options:
-    udp: {{udp}}
+    protocol: {{protocol}}
     bandwidth: {{bandwidth}}
     length: {{length}}
     window: {{window}}
index 3312453..4d37452 100644 (file)
@@ -123,7 +123,7 @@ class IperfTestCase(unittest.TestCase):
         self.assertRaises(AssertionError, p.run, result)
 
     def test_iperf_successful_sla_jitter(self, mock_ssh):
-        options = {"udp": "udp", "bandwidth": "20m"}
+        options = {"protocol": "udp", "bandwidth": "20m"}
         args = {
             'options': options,
             'sla': {'jitter': 10}
@@ -141,7 +141,7 @@ class IperfTestCase(unittest.TestCase):
         self.assertEqual(result, expected_result)
 
     def test_iperf_unsuccessful_sla_jitter(self, mock_ssh):
-        options = {"udp": "udp", "bandwidth": "20m"}
+        options = {"protocol": "udp", "bandwidth": "20m"}
         args = {
             'options': options,
             'sla': {'jitter': 0.0001}
@@ -156,6 +156,24 @@ class IperfTestCase(unittest.TestCase):
         mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
         self.assertRaises(AssertionError, p.run, result)
 
+    def test_iperf_successful_tcp_protocal(self, mock_ssh):
+        options = {"protocol": "tcp", "nodelay": "yes"}
+        args = {
+            'options': options,
+            'sla': {'bytes_per_second': 15000000}
+        }
+        result = {}
+
+        p = iperf3.Iperf(args, self.ctx)
+        mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
+        p.host = mock_ssh.SSH.from_node()
+
+        sample_output = self._read_sample_output(self.output_name_tcp)
+        mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
+        expected_result = utils.flatten_dict_key(jsonutils.loads(sample_output))
+        p.run(result)
+        self.assertEqual(result, expected_result)
+
     def test_iperf_unsuccessful_script_error(self, mock_ssh):
 
         options = {}
index 799cc20..f3244fd 100644 (file)
@@ -134,6 +134,14 @@ class TestResourceProfile(unittest.TestCase):
             self.assertIsNone(
                 self.resource_profile._prepare_collectd_conf("/opt/nsb_bin"))
 
+    def test__setup_intel_pmu(self):
+        self.assertIsNone(
+            self.resource_profile._setup_intel_pmu(self.ssh_mock, "/opt/nsb_bin"))
+
+    def test__setup_ovs_stats(self):
+        self.assertIsNone(
+            self.resource_profile._setup_ovs_stats(self.ssh_mock))
+
     @mock.patch("yardstick.network_services.nfvi.resource.open")
     @mock.patch("yardstick.network_services.nfvi.resource.os")
     def test__provide_config_file(self, mock_open, mock_os):
@@ -187,7 +195,6 @@ class TestResourceProfile(unittest.TestCase):
         res = self.resource_profile.parse_collectd_result({})
         expected_result = {'cpu': {}, 'dpdkstat': {}, 'hugepages': {},
                            'memory': {}, 'ovs_stats': {}, 'timestamp': '',
-                           'intel_pmu': {},
                            'virt': {}}
         self.assertDictEqual(res, expected_result)
 
@@ -200,7 +207,6 @@ class TestResourceProfile(unittest.TestCase):
         res = self.resource_profile.parse_collectd_result(metric)
         expected_result = {'cpu': {1: {'ipc': '1234'}}, 'dpdkstat': {}, 'hugepages': {},
                            'memory': {}, 'ovs_stats': {}, 'timestamp': '',
-                           'intel_pmu': {},
                            'virt': {}}
         self.assertDictEqual(res, expected_result)
 
@@ -209,7 +215,6 @@ class TestResourceProfile(unittest.TestCase):
         res = self.resource_profile.parse_collectd_result(metric)
         expected_result = {'cpu': {}, 'dpdkstat': {}, 'hugepages': {},
                            'memory': {'bw': '101'}, 'ovs_stats': {}, 'timestamp': '',
-                           'intel_pmu': {},
                            'virt': {}}
         self.assertDictEqual(res, expected_result)
 
@@ -220,7 +225,6 @@ class TestResourceProfile(unittest.TestCase):
         res = self.resource_profile.parse_collectd_result(metric)
         expected_result = {'cpu': {}, 'dpdkstat': {}, 'hugepages': {'free': '101'},
                            'memory': {}, 'ovs_stats': {}, 'timestamp': '',
-                           'intel_pmu': {},
                            'virt': {}}
         self.assertDictEqual(res, expected_result)
 
@@ -237,7 +241,6 @@ class TestResourceProfile(unittest.TestCase):
         res = self.resource_profile.parse_collectd_result(metric)
         expected_result = {'cpu': {}, 'dpdkstat': {'tx': '101'}, 'hugepages': {},
                            'memory': {}, 'ovs_stats': {'tx': '101'}, 'timestamp': '',
-                           'intel_pmu': {},
                            'virt': {'memory': '101'}}
         self.assertDictEqual(res, expected_result)
 
index a3d2737..98c4599 100644 (file)
@@ -111,18 +111,22 @@ For more info see http://software.es.net/iperf
 
         # If there are no options specified
         if not options:
-            options = ""
+            options = {}
 
         use_UDP = False
-        if "udp" in options:
-            cmd += " --udp"
-            use_UDP = True
-            if "bandwidth" in options:
-                cmd += " --bandwidth %s" % options["bandwidth"]
-        else:
-            # tcp obviously
+        try:
+            protocol = options.get("protocol")
+            bandwidth = options.get('bandwidth')
+            use_UDP = protocol == 'udp'
+            if protocol:
+                cmd += " --" + protocol
+            if use_UDP and bandwidth:
+                cmd += " --bandwidth " + bandwidth
+            # if nodelay in the option, protocal maybe null or 'tcp'
             if "nodelay" in options:
                 cmd += " --nodelay"
+        except AttributeError:
+            LOG.warning("Can't parser the options in your config file!!!")
 
         # these options are mutually exclusive in iperf3
         if time:
index e6a1f0d..b166fe7 100644 (file)
@@ -24,10 +24,17 @@ Interval {{ interval }}
 ##############################################################################
 
 #LoadPlugin syslog
-{% for plugin in loadplugins %}
+{% for plugin in loadplugins if plugin != "ovs_stats" %}
 LoadPlugin {{ plugin }}
 {% endfor %}
 
+{% if "ovs_stats" in plugins %}
+<LoadPlugin ovs_stats>
+  Interval 1
+</LoadPlugin>
+{% endif %}
+
+
 ##############################################################################
 # Plugin configuration                                                       #
 #----------------------------------------------------------------------------#
@@ -82,12 +89,11 @@ LoadPlugin {{ plugin }}
 {% endif %}
 
 {% if "intel_pmu" in plugins %}
-<Plugin intel_pmu>
+<Plugin "intel_pmu">
    ReportHardwareCacheEvents true
    ReportKernelPMUEvents true
    ReportSoftwareEvents true
-   EventList "/opt/nsb_bin/pmu_event.json"
-   HardwareEvents "L2_RQSTS.CODE_RD_HIT,L2_RQSTS.CODE_RD_MISS" "L2_RQSTS.ALL_CODE_RD"
+   EventList "{{ plugins['intel_pmu']['pmu_event_path'] }}"
 </Plugin>
 {% endif %}
 
@@ -110,6 +116,8 @@ LoadPlugin {{ plugin }}
 {% if "virt" in plugins %}
 <Plugin "virt">
 # monitor all domains
+  RefreshInterval 60
+  ExtraStats "cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpupin"
 </Plugin>
 {% endif %}
 
@@ -117,7 +125,7 @@ LoadPlugin {{ plugin }}
 <Plugin "ovs_stats">
   Port "6640"
   Address "127.0.0.1"
-  Socket "/usr/local/var/run/openvswitch/db.sock"
+  Socket "{{ plugins['ovs_stats']['ovs_socket_path'] }}"
 # don't specify bridges, monitor all bridges
 </Plugin>
 {% endif %}
index fef44e2..dea754d 100644 (file)
@@ -34,7 +34,7 @@ from yardstick import ssh
 from yardstick.common.task_template import finalize_for_yaml
 from yardstick.common.utils import validate_non_string_sequence
 from yardstick.network_services.nfvi.collectd import AmqpConsumer
-from yardstick.network_services.utils import get_nsb_option
+
 
 LOG = logging.getLogger(__name__)
 
@@ -53,6 +53,7 @@ class ResourceProfile(object):
     AMPQ_PORT = 5672
     DEFAULT_INTERVAL = 25
     DEFAULT_TIMEOUT = 3600
+    OVS_SOCKET_PATH = "/usr/local/var/run/openvswitch/db.sock"
 
     def __init__(self, mgmt, port_names=None, cores=None, plugins=None,
                  interval=None, timeout=None):
@@ -154,7 +155,6 @@ class ResourceProfile(object):
             "dpdkstat": {},
             "virt": {},
             "ovs_stats": {},
-            "intel_pmu": {},
         }
         testcase = ""
 
@@ -233,10 +233,32 @@ class ResourceProfile(object):
         }
         self._provide_config_file(config_file_path, self.COLLECTD_CONF, kwargs)
 
+    def _setup_intel_pmu(self, connection, bin_path):
+        pmu_event_path = os.path.join(bin_path, "pmu_event.json")
+        try:
+            self.plugins["intel_pmu"]["pmu_event_path"] = pmu_event_path
+        except KeyError:
+            # if intel_pmu is not a dict, force it into a dict
+            self.plugins["intel_pmu"] = {"pmu_event_path": pmu_event_path}
+        LOG.debug("Downloading event list for pmu_stats plugin")
+        cmd = 'cd {0}; PMU_EVENTS_PATH={1} python event_download_local.py'.format(
+            bin_path, pmu_event_path)
+        cmd = "sudo bash -c '{}'".format(cmd)
+        connection.execute(cmd)
+
+    def _setup_ovs_stats(self, connection):
+        try:
+            socket_path = self.plugins["ovs_stats"].get("ovs_socket_path", self.OVS_SOCKET_PATH)
+        except KeyError:
+            # ovs_stats is not a dict
+            socket_path = self.OVS_SOCKET_PATH
+        status = connection.execute("test -S {}".format(socket_path))[0]
+        if status != 0:
+            LOG.error("cannot find OVS socket %s", socket_path)
+
     def _start_collectd(self, connection, bin_path):
         LOG.debug("Starting collectd to collect NFVi stats")
         connection.execute('sudo pkill -x -9 collectd')
-        bin_path = get_nsb_option("bin_path")
         collectd_path = os.path.join(bin_path, "collectd", "sbin", "collectd")
         config_file_path = os.path.join(bin_path, "collectd", "etc")
         exit_status = connection.execute("which %s > /dev/null 2>&1" % collectd_path)[0]
@@ -251,9 +273,10 @@ class ResourceProfile(object):
             #     collectd_installer, http_proxy, https_proxy))
             return
         if "intel_pmu" in self.plugins:
-            LOG.debug("Downloading event list for pmu_stats plugin")
-            cmd = 'sudo bash -c \'cd /opt/tempT/pmu-tools/; python event_download_local.py\''
-            connection.execute(cmd)
+            self._setup_intel_pmu(connection, bin_path)
+        if "ovs_stats" in self.plugins:
+            self._setup_ovs_stats(connection)
+
         LOG.debug("Starting collectd to collect NFVi stats")
         # ensure collectd.conf.d exists to avoid error/warning
         connection.execute("sudo mkdir -p /etc/collectd/collectd.conf.d")