From c4709e7085e67dfb7b9d90969ac84270d2a5c54a Mon Sep 17 00:00:00 2001
From: Neil Williams <codehelp@debian.org>
Date: Fri, 23 Aug 2013 10:28:31 +0100
Subject: prevent directory conflict with the unpacked netperf directory.

---
 netperf-defs/beagleblack-netperf-group.json   | 64 +++++++++++++++++++++++++++
 netperf-defs/imx53-netperf-group.json         | 64 +++++++++++++++++++++++++++
 netperf-defs/netperf-client-napi.sh           | 37 ++++++++++++++++
 netperf-defs/netperf-client.sh                | 24 ++++++++++
 netperf-defs/netperf-multinode-c-network.yaml | 38 ++++++++++++++++
 netperf-defs/netperf-multinode-s-network.yaml | 38 ++++++++++++++++
 netperf-defs/netperf-server.sh                | 17 +++++++
 netperf-defs/netperf2LAVA.py                  | 55 +++++++++++++++++++++++
 netperf-defs/singlenode-network.yaml          | 27 +++++++++++
 netperf/imx53-netperf-group.json              | 64 ---------------------------
 netperf/netperf-client-napi.sh                | 37 ----------------
 netperf/netperf-client.sh                     | 24 ----------
 netperf/netperf-multinode-c-network.yaml      | 38 ----------------
 netperf/netperf-multinode-s-network.yaml      | 38 ----------------
 netperf/netperf-server.sh                     | 17 -------
 netperf/netperf2LAVA.py                       | 55 -----------------------
 netperf/singlenode-network.yaml               | 27 -----------
 17 files changed, 364 insertions(+), 300 deletions(-)
 create mode 100644 netperf-defs/beagleblack-netperf-group.json
 create mode 100644 netperf-defs/imx53-netperf-group.json
 create mode 100755 netperf-defs/netperf-client-napi.sh
 create mode 100755 netperf-defs/netperf-client.sh
 create mode 100644 netperf-defs/netperf-multinode-c-network.yaml
 create mode 100644 netperf-defs/netperf-multinode-s-network.yaml
 create mode 100755 netperf-defs/netperf-server.sh
 create mode 100755 netperf-defs/netperf2LAVA.py
 create mode 100644 netperf-defs/singlenode-network.yaml
 delete mode 100644 netperf/imx53-netperf-group.json
 delete mode 100755 netperf/netperf-client-napi.sh
 delete mode 100755 netperf/netperf-client.sh
 delete mode 100644 netperf/netperf-multinode-c-network.yaml
 delete mode 100644 netperf/netperf-multinode-s-network.yaml
 delete mode 100755 netperf/netperf-server.sh
 delete mode 100755 netperf/netperf2LAVA.py
 delete mode 100644 netperf/singlenode-network.yaml

diff --git a/netperf-defs/beagleblack-netperf-group.json b/netperf-defs/beagleblack-netperf-group.json
new file mode 100644
index 0000000..4f745d8
--- /dev/null
+++ b/netperf-defs/beagleblack-netperf-group.json
@@ -0,0 +1,64 @@
+{
+    "timeout": 900,
+    "job_name": "netperf beagleblack tests",
+    "logging_level": "DEBUG",
+    "device_group": [
+        {
+            "role": "client",
+            "count": 1,
+            "device_type": "beaglebone-black",
+            "tags": [
+                "test-client"
+            ]
+        },
+        {
+            "role": "server",
+            "count": 1,
+            "device_type": "beaglebone-black",
+            "tags": [
+                "test-server"
+            ]
+        }
+    ],
+    "actions": [
+        {
+            "command": "deploy_linaro_image",
+            "parameters": {
+                "image": "http://linaro-gateway/beaglebone/beaglebone_20130625-379.img.gz"
+            }
+        },
+        {
+            "command": "lava_test_shell",
+            "parameters": {
+                "testdef_repos": [
+                    {
+                        "git-repo": "git://git.linaro.org/people/neilwilliams/multinode-yaml.git",
+                        "testdef": "netperf-defs/netperf-multinode-c-network.yaml"
+                    }
+                ],
+                "timeout": 1800,
+                "role": "client"
+            }
+        },
+        {
+            "command": "lava_test_shell",
+            "parameters": {
+                "testdef_repos": [
+                    {
+                        "git-repo": "git://git.linaro.org/people/neilwilliams/multinode-yaml.git",
+                        "testdef": "netperf-defs/netperf-multinode-s-network.yaml"
+                    }
+                ],
+                "timeout": 1800,
+                "role": "server"
+            }
+        },
+        {
+            "command": "submit_results_on_host",
+            "parameters": {
+                "stream": "/anonymous/codehelp/",
+                "server": "http://staging.validation.linaro.org/RPC2/"
+            }
+        }
+    ]
+}
diff --git a/netperf-defs/imx53-netperf-group.json b/netperf-defs/imx53-netperf-group.json
new file mode 100644
index 0000000..c92681d
--- /dev/null
+++ b/netperf-defs/imx53-netperf-group.json
@@ -0,0 +1,64 @@
+{
+    "timeout": 900,
+    "job_name": "netperf imx53 tests",
+    "logging_level": "DEBUG",
+    "device_group": [
+        {
+            "role": "client",
+            "count": 1,
+            "device_type": "mx53loco",
+            "tags": [
+                "test-client"
+            ]
+        },
+        {
+            "role": "server",
+            "count": 1,
+            "device_type": "mx53loco",
+            "tags": [
+                "test-server"
+            ]
+        }
+    ],
+    "actions": [
+        {
+            "command": "deploy_linaro_image",
+            "parameters": {
+                "image": "file:///home/codehelp/images/mx53loco-ubuntu-desktop.img.gz"
+            }
+        },
+        {
+            "command": "lava_test_shell",
+            "parameters": {
+                "testdef_repos": [
+                    {
+                        "git-repo": "git://git.linaro.org/people/neilwilliams/multinode-yaml.git",
+                        "testdef": "netperf-defs/netperf-multinode-c-network.yaml"
+                    }
+                ],
+                "timeout": 1800,
+                "role": "client"
+            }
+        },
+        {
+            "command": "lava_test_shell",
+            "parameters": {
+                "testdef_repos": [
+                    {
+                        "git-repo": "git://git.linaro.org/people/neilwilliams/multinode-yaml.git",
+                        "testdef": "netperf-defs/netperf-multinode-s-network.yaml"
+                    }
+                ],
+                "timeout": 1800,
+                "role": "server"
+            }
+        },
+        {
+            "command": "submit_results_on_host",
+            "parameters": {
+                "stream": "/anonymous/instance-manager/",
+                "server": "http://multinode.validation.linaro.org/RPC2/"
+            }
+        }
+    ]
+}
diff --git a/netperf-defs/netperf-client-napi.sh b/netperf-defs/netperf-client-napi.sh
new file mode 100755
index 0000000..ebf9b8a
--- /dev/null
+++ b/netperf-defs/netperf-client-napi.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+set -x
+
+cat /tmp/lava_multi_node_network_cache.txt
+
+local_ip=$(ifconfig|grep "inet addr"|grep -v "127.0.0.1"|cut -d: -f2|cut -d' ' -f1)
+
+for line in `lava-group | awk '{print $1}'` ; do
+	echo $line
+	# get the ipv4 for this device
+	STR=`lava-network query $line ipv4`
+	echo "STR: "$STR
+	# strip off the prefix for ipv4
+	DUT=`echo $STR | sed -e 's/.*addr://'`
+	echo "DUT: "$DUT
+	if [ "${local_ip}" != "${DUT}" ]; then
+		remote_ip=${DUT}
+		echo ${remote_ip}
+		break
+	fi
+done
+
+if [ -z ${remote_ip} ]
+then
+	echo "Missing remote ip!"
+	exit 1
+fi
+
+cd netperf/build/bin
+which python
+pwd
+ls -l ../../../
+for m in 64 128 256 512 1024 2048 4096 8192 16384; do ./netperf -H ${remote_ip} -l 20 -c -C -- -m $m -D; done | ../../../netperf/netperf2LAVA.py
+for m in 64 128 256 512 1024 2048 4096 8192 16384; do ./netperf -H ${remote_ip} -l 20 -t UDP_STREAM -c -C -- -m $m -D; done | ../../../netperf/netperf2LAVA.py
+for m in 1 32 64 128 512 1024 4096 8192 16384; do ./netperf -t TCP_RR -H ${remote_ip} -l 20 -c -C -- -r $m,$m -D; done | ../../../netperf/netperf2LAVA.py
+for m in 1 32 64 128 512 1024 4096 8192 16384; do ./netperf -t UDP_RR -H ${remote_ip} -l 20 -c -C -- -r $m,$m -D; done | ../../../netperf/netperf2LAVA.py
diff --git a/netperf-defs/netperf-client.sh b/netperf-defs/netperf-client.sh
new file mode 100755
index 0000000..7fd2fe3
--- /dev/null
+++ b/netperf-defs/netperf-client.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+
+#local_ip=$(ifconfig|grep "inet addr"|grep -v "127.0.0.1"|cut -d: -f2|cut -d' ' -f1)
+
+#echo "local ip:"${local_ip}
+#for line in `grep ":ip=" /tmp/lava_multi_node_cache.txt |cut -d'=' -f2` ; do
+#	if [ "${local_ip}" != "${line}" ]; then	 
+#		remote_ip=${line}
+#		echo "remote ip:"${remote_ip}
+#	fi
+#done
+
+remote_ip=$(cat /tmp/remote_ip)
+
+cd build/bin
+
+./netperf -H ${remote_ip} -l 60 | ../../netperf/netperf2LAVA.py
+./netperf -t UDP_STREAM -H ${remote_ip} -- -m 1024 | ../../netperf/netperf2LAVA.py
+./netperf -t TCP_RR -H ${remote_ip} | ../../netperf/netperf2LAVA.py
+./netperf -t TCP_RR -H ${remote_ip} -- -r 32,1024| ../../netperf/netperf2LAVA.py
+./netperf -t TCP_CRR -H ${remote_ip} | ../../netperf/netperf2LAVA.py
+./netperf -t UDP_RR -H ${remote_ip} | ../../netperf/netperf2LAVA.py
diff --git a/netperf-defs/netperf-multinode-c-network.yaml b/netperf-defs/netperf-multinode-c-network.yaml
new file mode 100644
index 0000000..6b94d07
--- /dev/null
+++ b/netperf-defs/netperf-multinode-c-network.yaml
@@ -0,0 +1,38 @@
+metadata:
+    format: Lava-Test Test Definition 1.0
+    name: netperf-multinode-client-napi
+    description: "netperf client test"
+
+install:
+     steps:
+         - 'mkdir netperf || true'
+         - 'cd netperf'
+         - 'curl ftp://ftp.netperf.org/netperf/netperf-2.6.0.tar.gz > netperf-2.6.0.tar.gz'
+         - 'tar --strip-components=1 -zxf netperf-2.6.0.tar.gz'
+         - 'mkdir build'
+         - './configure --prefix=$(readlink -f build)'
+         - 'make all'
+         - 'make SKIP_IDCHECK=1 install'
+         - 'cd ..'
+     deps:
+         - gzip
+         - flex
+         - bison
+         - build-essential
+         - curl
+         - wget
+
+run:
+    steps:
+        - ifconfig eth0 down
+        - dhclient -v eth0
+        - ifconfig -a
+        - route
+        - lava-network broadcast eth0
+        - lava-network collect eth0
+        - lava-sync ready 
+        - lava-test-case multinode-lava-network --shell ./netperf/netperf-client-napi.sh
+        - lava-sync done 
+
+parse:
+        "pattern": "^test_case_id:(?P<test_case_id>.+) units:(?P<units>.+) measurement:(?P<measurement>[0-9]+.[0-9]+) result:(?P<result>\\w+)"
diff --git a/netperf-defs/netperf-multinode-s-network.yaml b/netperf-defs/netperf-multinode-s-network.yaml
new file mode 100644
index 0000000..e6d90f4
--- /dev/null
+++ b/netperf-defs/netperf-multinode-s-network.yaml
@@ -0,0 +1,38 @@
+metadata:
+    format: Lava-Test Test Definition 1.0
+    name: netperf-multinode-server-napi
+    description: "netperf server test"
+
+install:
+     steps:
+         - 'mkdir netperf || true'
+         - 'cd netperf'
+         - 'curl ftp://ftp.netperf.org/netperf/netperf-2.6.0.tar.gz > netperf-2.6.0.tar.gz'
+         - 'tar --strip-components=1 -zxf netperf-2.6.0.tar.gz'
+         - 'mkdir build'
+         - './configure --prefix=$(readlink -f build)'
+         - 'make all'
+         - 'make SKIP_IDCHECK=1 install'
+         - 'cd ..'
+     deps:
+         - gzip
+         - flex
+         - bison
+         - build-essential
+         - curl
+         - wget
+
+run:
+    steps:
+        - ifconfig eth0 down
+        - dhclient -v eth0
+        - ifconfig -a
+        - route
+        - lava-network broadcast eth0
+        - lava-network collect eth0
+        - lava-test-case multinode-lava-network --shell ./netperf/netperf-server.sh
+        - lava-sync ready 
+        - lava-sync done 
+
+parse:
+        "pattern": "^test_case_id:(?P<test_case_id>.+) units:(?P<units>.+) measurement:(?P<measurement>[0-9]+.[0-9]+) result:(?P<result>\\w+)"
diff --git a/netperf-defs/netperf-server.sh b/netperf-defs/netperf-server.sh
new file mode 100755
index 0000000..b3684be
--- /dev/null
+++ b/netperf-defs/netperf-server.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -x
+
+#local_ip=$(ifconfig|grep "inet addr"|grep -v "127.0.0.1"|cut -d: -f2|cut -d' ' -f1)
+
+#echo "local ip:"${local_ip}
+#for line in `grep ":ip=" /tmp/lava_multi_node_cache.txt |cut -d'=' -f2` ; do
+#	if [ "${local_ip}" != "${line}" ]; then	 
+#		remote_ip=${line}
+#		echo "remote ip:"${remote_ip}
+#	fi
+#done
+
+cd netperf/build/bin
+
+./netserver && echo 'test_case_id:netserver units:none measurement:0 result:pass' || echo 'test_case_id:netserver units:none measurement:0 result:fail'
diff --git a/netperf-defs/netperf2LAVA.py b/netperf-defs/netperf2LAVA.py
new file mode 100755
index 0000000..ce47012
--- /dev/null
+++ b/netperf-defs/netperf2LAVA.py
@@ -0,0 +1,55 @@
+#!/usr/bin/python
+import re
+import sys
+
+#Parse netperf results looking for the data in the form of
+#line = "87380 16384 2048 10.00 4289.48 51.12 51.12 3.905 3.905" ./netperf -l 10 -c -C -- -m 2048 -D 
+#line = "180224    8192   10.00     1654855      0    10845.1     52.60    1.589" ./netperf -t UDP_STREAM -l 10 -c -C -- -m 8192 -D 
+#line = "180224           10.00     1649348           10809.0     52.60    1.589" rcv side of UDP_STREAM 
+#line = "16384  87380  1       1      10.00   47469.68  29.84  29.84  25.146  25.146" ./netperf -t TCP_RR -l 10 -c -C -- -r 1,1 
+
+found_result = "false"
+parser_tcp = re.compile("^\s*(?P<Recv>\d+)\s+(?P<Send>\d+)\s+(?P<Msg>\d+)\s+(?P<time>\d+\.\d+)\s+(?P<throughput>\d+\.\d+)\s+(?P<cpu_s>\d+\.\d+)\s+(?P<cpu_r>\d+\.\d+)\s+(?P<srv_s>\d+\.\d+)\s+(?P<dem_r>\d+\.\d+)\s*$")
+parser_udp_l = re.compile("^\s*(?P<Sock>\d+)\s+(?P<Msg>\d+)\s+(?P<time>\d+\.\d+)\s+(?P<Okey>\d+)\s+(?P<Errs>\d+)\s+(?P<throughput>\d+\.\d+)\s+(?P<cpu_s>\d+\.\d+)\s+(?P<srv_s>\d+\.\d+)\s*$")
+parser_udp_r = re.compile("^\s*(?P<Sock>\d+)\s+(?P<time>\d+\.\d+)\s+(?P<Okey>\d+)\s+(?P<throughput>\d+\.\d+)\s+(?P<cpu_r>\d+\.\d+)\s+(?P<srv_r>\d+\.\d+)\s*$")
+parser_rr = re.compile("^\s*(?P<Send>\d+)\s+(?P<Recv>\d+)\s+(?P<Req>\d+)\s+(?P<Res>\d+)\s+(?P<time>\d+\.\d+)\s+(?P<trans>\d+\.\d+)\s+(?P<cpu_s>\d+\.\d+)\s+(?P<cpu_r>\d+\.\d+)\s+(?P<srv_s>\d+\.\d+)\s+(?P<dem_r>\d+\.\d+)\s*$")
+parser_rr_tcp = re.compile("TCP REQUEST/RESPONSE")
+parser_rr_udp = re.compile("UDP REQUEST/RESPONSE")
+
+for line in sys.stdin:
+        for parser in [parser_tcp, parser_udp_l, parser_udp_r, parser_rr, parser_rr_tcp, parser_rr_udp]:
+                result = parser.search(line)
+                if result is not None:
+                        if parser is parser_rr_tcp:
+                                rr_type = "TCP_RR"
+                                break
+                        if parser is parser_rr_udp:
+                                rr_type = "UDP_RR"
+                                break
+                        if parser is parser_tcp:
+                                print "test_case_id:TCP_STREAM throughput" + "(Msg Sz: " + result.group('Msg') + ")" + " units:10^bits/sec " + "measurement:" + result.group('throughput') + " result:pass"
+                                print "test_case_id:TCP_STREAM snd cpu utilization" + "(Msg Sz: " + result.group('Msg') + ")" + " units:% " + "measurement:" + result.group('cpu_s') + " result:pass"
+                                print "test_case_id:TCP_STREAM rcv cpu utilization" + "(Msg Sz: " + result.group('Msg') + ")" + " units:% " + "measurement:" + result.group('cpu_r') + " result:pass"
+                                found_result = "true"
+                                break
+                        if parser is parser_udp_l:
+                                print "test_case_id:UDP_STREAM snd throughput" + "(Msg Sz: " + result.group('Msg') + ")" + " units:10^bits/sec " + "measurement:" + result.group('throughput') + " result:pass"
+                                print "test_case_id:UDP_STREAM snd cpu utilization" + "(Msg Sz: " + result.group('Msg') + ")" + " units:% " + "measurement:" + result.group('cpu_s') + " result:pass"
+                                found_result = "true"
+                                break 
+                        if parser is parser_udp_r:
+                                print "test_case_id:UDP_STREAM rcv throughput" + " units:10^bits/sec " + "measurement:" + result.group('throughput') + " result:pass"
+                                print "test_case_id:UDP_STREAM rcv cpu utilization" + " units:% " + "measurement:" + result.group('cpu_r') + " result:pass"
+                                found_result = "true"
+                                break
+                        if parser is parser_rr:
+                                print "test_case_id:" + rr_type + " transaction rate" + "(Req Sz: " + result.group('Req') + " Res Sz: " + result.group('Res') + ")" + " units:trans/sec " + "measurement:" + result.group('trans') + " result:pass"
+                                print "test_case_id:" + rr_type + " snd cpu utilization" + "(Req Sz: " + result.group('Req') + " Res Sz: " + result.group('Res') + ")" + " units:% " + "measurement:" + result.group('cpu_s') + " result:pass"
+                                print "test_case_id:" + rr_type + " rcv cpu utilization" + "(Req Sz: " + result.group('Req') + " Res Sz: " + result.group('Res') + ")" + " units:% " + "measurement:" + result.group('cpu_r') + " result:pass"
+                                found_result = "true"
+                                break
+                else:
+                        continue                 
+
+if found_result == "false":
+        print "units:none " + "measuremnt:" + "0" + " result:fail"
diff --git a/netperf-defs/singlenode-network.yaml b/netperf-defs/singlenode-network.yaml
new file mode 100644
index 0000000..45d529f
--- /dev/null
+++ b/netperf-defs/singlenode-network.yaml
@@ -0,0 +1,27 @@
+metadata:
+    format: Lava-Test Test Definition 1.0
+    name: netperf-multinode-client-napi
+    description: "Basic MultiNode netperf client test for Linux Linaro ubuntu Images"
+
+install:
+     steps:
+         - 'curl -o netperf-2.6.0.tar.gz ftp://ftp.netperf.org/netperf/netperf-2.6.0.tar.gz'
+         - 'tar --strip-components=1 -zxf netperf-2.6.0.tar.gz'
+         - 'mkdir build'
+         - './configure --prefix=$(readlink -f build)'
+         - 'make all'
+         - 'make SKIP_IDCHECK=1 install'
+     deps:
+         - gzip
+         - flex
+         - bison
+         - build-essential
+         - curl
+         - wget
+
+run:
+    steps:
+        - ifconfig eth0 down
+        - dhclient -v eth0
+        - ifconfig -a
+        - route
diff --git a/netperf/imx53-netperf-group.json b/netperf/imx53-netperf-group.json
deleted file mode 100644
index 071b705..0000000
--- a/netperf/imx53-netperf-group.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-    "timeout": 900,
-    "job_name": "netperf imx53 tests",
-    "logging_level": "DEBUG",
-    "device_group": [
-        {
-            "role": "client",
-            "count": 1,
-            "device_type": "panda",
-            "tags": [
-                "test-client"
-            ]
-        },
-        {
-            "role": "server",
-            "count": 1,
-            "device_type": "panda",
-            "tags": [
-                "test-server"
-            ]
-        }
-    ],
-    "actions": [
-        {
-            "command": "deploy_linaro_image",
-            "parameters": {
-                "image": "file:///home/codehelp/images/mx53loco-ubuntu-desktop.img.gz"
-            }
-        },
-        {
-            "command": "lava_test_shell",
-            "parameters": {
-                "testdef_repos": [
-                    {
-                        "git-repo": "git://git.linaro.org/people/guoqing.zhu/netperf-multinode.git",
-                        "testdef": "netperf/netperf-multinode-c-network.yaml"
-                    }
-                ],
-                "timeout": 1800,
-                "role": "client"
-            }
-        },
-        {
-            "command": "lava_test_shell",
-            "parameters": {
-                "testdef_repos": [
-                    {
-                        "git-repo": "git://git.linaro.org/people/guoqing.zhu/netperf-multinode.git",
-                        "testdef": "netperf/netperf-multinode-s-network.yaml"
-                    }
-                ],
-                "timeout": 1800,
-                "role": "server"
-            }
-        },
-        {
-            "command": "submit_results_on_host",
-            "parameters": {
-                "stream": "/anonymous/codehelp/",
-                "server": "http://multinode.validation.linaro.org/RPC2/"
-            }
-        }
-    ]
-}
diff --git a/netperf/netperf-client-napi.sh b/netperf/netperf-client-napi.sh
deleted file mode 100755
index ebf9b8a..0000000
--- a/netperf/netperf-client-napi.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-set -x
-
-cat /tmp/lava_multi_node_network_cache.txt
-
-local_ip=$(ifconfig|grep "inet addr"|grep -v "127.0.0.1"|cut -d: -f2|cut -d' ' -f1)
-
-for line in `lava-group | awk '{print $1}'` ; do
-	echo $line
-	# get the ipv4 for this device
-	STR=`lava-network query $line ipv4`
-	echo "STR: "$STR
-	# strip off the prefix for ipv4
-	DUT=`echo $STR | sed -e 's/.*addr://'`
-	echo "DUT: "$DUT
-	if [ "${local_ip}" != "${DUT}" ]; then
-		remote_ip=${DUT}
-		echo ${remote_ip}
-		break
-	fi
-done
-
-if [ -z ${remote_ip} ]
-then
-	echo "Missing remote ip!"
-	exit 1
-fi
-
-cd netperf/build/bin
-which python
-pwd
-ls -l ../../../
-for m in 64 128 256 512 1024 2048 4096 8192 16384; do ./netperf -H ${remote_ip} -l 20 -c -C -- -m $m -D; done | ../../../netperf/netperf2LAVA.py
-for m in 64 128 256 512 1024 2048 4096 8192 16384; do ./netperf -H ${remote_ip} -l 20 -t UDP_STREAM -c -C -- -m $m -D; done | ../../../netperf/netperf2LAVA.py
-for m in 1 32 64 128 512 1024 4096 8192 16384; do ./netperf -t TCP_RR -H ${remote_ip} -l 20 -c -C -- -r $m,$m -D; done | ../../../netperf/netperf2LAVA.py
-for m in 1 32 64 128 512 1024 4096 8192 16384; do ./netperf -t UDP_RR -H ${remote_ip} -l 20 -c -C -- -r $m,$m -D; done | ../../../netperf/netperf2LAVA.py
diff --git a/netperf/netperf-client.sh b/netperf/netperf-client.sh
deleted file mode 100755
index 7fd2fe3..0000000
--- a/netperf/netperf-client.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#local_ip=$(ifconfig|grep "inet addr"|grep -v "127.0.0.1"|cut -d: -f2|cut -d' ' -f1)
-
-#echo "local ip:"${local_ip}
-#for line in `grep ":ip=" /tmp/lava_multi_node_cache.txt |cut -d'=' -f2` ; do
-#	if [ "${local_ip}" != "${line}" ]; then	 
-#		remote_ip=${line}
-#		echo "remote ip:"${remote_ip}
-#	fi
-#done
-
-remote_ip=$(cat /tmp/remote_ip)
-
-cd build/bin
-
-./netperf -H ${remote_ip} -l 60 | ../../netperf/netperf2LAVA.py
-./netperf -t UDP_STREAM -H ${remote_ip} -- -m 1024 | ../../netperf/netperf2LAVA.py
-./netperf -t TCP_RR -H ${remote_ip} | ../../netperf/netperf2LAVA.py
-./netperf -t TCP_RR -H ${remote_ip} -- -r 32,1024| ../../netperf/netperf2LAVA.py
-./netperf -t TCP_CRR -H ${remote_ip} | ../../netperf/netperf2LAVA.py
-./netperf -t UDP_RR -H ${remote_ip} | ../../netperf/netperf2LAVA.py
diff --git a/netperf/netperf-multinode-c-network.yaml b/netperf/netperf-multinode-c-network.yaml
deleted file mode 100644
index 6b94d07..0000000
--- a/netperf/netperf-multinode-c-network.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-metadata:
-    format: Lava-Test Test Definition 1.0
-    name: netperf-multinode-client-napi
-    description: "netperf client test"
-
-install:
-     steps:
-         - 'mkdir netperf || true'
-         - 'cd netperf'
-         - 'curl ftp://ftp.netperf.org/netperf/netperf-2.6.0.tar.gz > netperf-2.6.0.tar.gz'
-         - 'tar --strip-components=1 -zxf netperf-2.6.0.tar.gz'
-         - 'mkdir build'
-         - './configure --prefix=$(readlink -f build)'
-         - 'make all'
-         - 'make SKIP_IDCHECK=1 install'
-         - 'cd ..'
-     deps:
-         - gzip
-         - flex
-         - bison
-         - build-essential
-         - curl
-         - wget
-
-run:
-    steps:
-        - ifconfig eth0 down
-        - dhclient -v eth0
-        - ifconfig -a
-        - route
-        - lava-network broadcast eth0
-        - lava-network collect eth0
-        - lava-sync ready 
-        - lava-test-case multinode-lava-network --shell ./netperf/netperf-client-napi.sh
-        - lava-sync done 
-
-parse:
-        "pattern": "^test_case_id:(?P<test_case_id>.+) units:(?P<units>.+) measurement:(?P<measurement>[0-9]+.[0-9]+) result:(?P<result>\\w+)"
diff --git a/netperf/netperf-multinode-s-network.yaml b/netperf/netperf-multinode-s-network.yaml
deleted file mode 100644
index e6d90f4..0000000
--- a/netperf/netperf-multinode-s-network.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-metadata:
-    format: Lava-Test Test Definition 1.0
-    name: netperf-multinode-server-napi
-    description: "netperf server test"
-
-install:
-     steps:
-         - 'mkdir netperf || true'
-         - 'cd netperf'
-         - 'curl ftp://ftp.netperf.org/netperf/netperf-2.6.0.tar.gz > netperf-2.6.0.tar.gz'
-         - 'tar --strip-components=1 -zxf netperf-2.6.0.tar.gz'
-         - 'mkdir build'
-         - './configure --prefix=$(readlink -f build)'
-         - 'make all'
-         - 'make SKIP_IDCHECK=1 install'
-         - 'cd ..'
-     deps:
-         - gzip
-         - flex
-         - bison
-         - build-essential
-         - curl
-         - wget
-
-run:
-    steps:
-        - ifconfig eth0 down
-        - dhclient -v eth0
-        - ifconfig -a
-        - route
-        - lava-network broadcast eth0
-        - lava-network collect eth0
-        - lava-test-case multinode-lava-network --shell ./netperf/netperf-server.sh
-        - lava-sync ready 
-        - lava-sync done 
-
-parse:
-        "pattern": "^test_case_id:(?P<test_case_id>.+) units:(?P<units>.+) measurement:(?P<measurement>[0-9]+.[0-9]+) result:(?P<result>\\w+)"
diff --git a/netperf/netperf-server.sh b/netperf/netperf-server.sh
deleted file mode 100755
index b3684be..0000000
--- a/netperf/netperf-server.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -x
-
-#local_ip=$(ifconfig|grep "inet addr"|grep -v "127.0.0.1"|cut -d: -f2|cut -d' ' -f1)
-
-#echo "local ip:"${local_ip}
-#for line in `grep ":ip=" /tmp/lava_multi_node_cache.txt |cut -d'=' -f2` ; do
-#	if [ "${local_ip}" != "${line}" ]; then	 
-#		remote_ip=${line}
-#		echo "remote ip:"${remote_ip}
-#	fi
-#done
-
-cd netperf/build/bin
-
-./netserver && echo 'test_case_id:netserver units:none measurement:0 result:pass' || echo 'test_case_id:netserver units:none measurement:0 result:fail'
diff --git a/netperf/netperf2LAVA.py b/netperf/netperf2LAVA.py
deleted file mode 100755
index ce47012..0000000
--- a/netperf/netperf2LAVA.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/python
-import re
-import sys
-
-#Parse netperf results looking for the data in the form of
-#line = "87380 16384 2048 10.00 4289.48 51.12 51.12 3.905 3.905" ./netperf -l 10 -c -C -- -m 2048 -D 
-#line = "180224    8192   10.00     1654855      0    10845.1     52.60    1.589" ./netperf -t UDP_STREAM -l 10 -c -C -- -m 8192 -D 
-#line = "180224           10.00     1649348           10809.0     52.60    1.589" rcv side of UDP_STREAM 
-#line = "16384  87380  1       1      10.00   47469.68  29.84  29.84  25.146  25.146" ./netperf -t TCP_RR -l 10 -c -C -- -r 1,1 
-
-found_result = "false"
-parser_tcp = re.compile("^\s*(?P<Recv>\d+)\s+(?P<Send>\d+)\s+(?P<Msg>\d+)\s+(?P<time>\d+\.\d+)\s+(?P<throughput>\d+\.\d+)\s+(?P<cpu_s>\d+\.\d+)\s+(?P<cpu_r>\d+\.\d+)\s+(?P<srv_s>\d+\.\d+)\s+(?P<dem_r>\d+\.\d+)\s*$")
-parser_udp_l = re.compile("^\s*(?P<Sock>\d+)\s+(?P<Msg>\d+)\s+(?P<time>\d+\.\d+)\s+(?P<Okey>\d+)\s+(?P<Errs>\d+)\s+(?P<throughput>\d+\.\d+)\s+(?P<cpu_s>\d+\.\d+)\s+(?P<srv_s>\d+\.\d+)\s*$")
-parser_udp_r = re.compile("^\s*(?P<Sock>\d+)\s+(?P<time>\d+\.\d+)\s+(?P<Okey>\d+)\s+(?P<throughput>\d+\.\d+)\s+(?P<cpu_r>\d+\.\d+)\s+(?P<srv_r>\d+\.\d+)\s*$")
-parser_rr = re.compile("^\s*(?P<Send>\d+)\s+(?P<Recv>\d+)\s+(?P<Req>\d+)\s+(?P<Res>\d+)\s+(?P<time>\d+\.\d+)\s+(?P<trans>\d+\.\d+)\s+(?P<cpu_s>\d+\.\d+)\s+(?P<cpu_r>\d+\.\d+)\s+(?P<srv_s>\d+\.\d+)\s+(?P<dem_r>\d+\.\d+)\s*$")
-parser_rr_tcp = re.compile("TCP REQUEST/RESPONSE")
-parser_rr_udp = re.compile("UDP REQUEST/RESPONSE")
-
-for line in sys.stdin:
-        for parser in [parser_tcp, parser_udp_l, parser_udp_r, parser_rr, parser_rr_tcp, parser_rr_udp]:
-                result = parser.search(line)
-                if result is not None:
-                        if parser is parser_rr_tcp:
-                                rr_type = "TCP_RR"
-                                break
-                        if parser is parser_rr_udp:
-                                rr_type = "UDP_RR"
-                                break
-                        if parser is parser_tcp:
-                                print "test_case_id:TCP_STREAM throughput" + "(Msg Sz: " + result.group('Msg') + ")" + " units:10^bits/sec " + "measurement:" + result.group('throughput') + " result:pass"
-                                print "test_case_id:TCP_STREAM snd cpu utilization" + "(Msg Sz: " + result.group('Msg') + ")" + " units:% " + "measurement:" + result.group('cpu_s') + " result:pass"
-                                print "test_case_id:TCP_STREAM rcv cpu utilization" + "(Msg Sz: " + result.group('Msg') + ")" + " units:% " + "measurement:" + result.group('cpu_r') + " result:pass"
-                                found_result = "true"
-                                break
-                        if parser is parser_udp_l:
-                                print "test_case_id:UDP_STREAM snd throughput" + "(Msg Sz: " + result.group('Msg') + ")" + " units:10^bits/sec " + "measurement:" + result.group('throughput') + " result:pass"
-                                print "test_case_id:UDP_STREAM snd cpu utilization" + "(Msg Sz: " + result.group('Msg') + ")" + " units:% " + "measurement:" + result.group('cpu_s') + " result:pass"
-                                found_result = "true"
-                                break 
-                        if parser is parser_udp_r:
-                                print "test_case_id:UDP_STREAM rcv throughput" + " units:10^bits/sec " + "measurement:" + result.group('throughput') + " result:pass"
-                                print "test_case_id:UDP_STREAM rcv cpu utilization" + " units:% " + "measurement:" + result.group('cpu_r') + " result:pass"
-                                found_result = "true"
-                                break
-                        if parser is parser_rr:
-                                print "test_case_id:" + rr_type + " transaction rate" + "(Req Sz: " + result.group('Req') + " Res Sz: " + result.group('Res') + ")" + " units:trans/sec " + "measurement:" + result.group('trans') + " result:pass"
-                                print "test_case_id:" + rr_type + " snd cpu utilization" + "(Req Sz: " + result.group('Req') + " Res Sz: " + result.group('Res') + ")" + " units:% " + "measurement:" + result.group('cpu_s') + " result:pass"
-                                print "test_case_id:" + rr_type + " rcv cpu utilization" + "(Req Sz: " + result.group('Req') + " Res Sz: " + result.group('Res') + ")" + " units:% " + "measurement:" + result.group('cpu_r') + " result:pass"
-                                found_result = "true"
-                                break
-                else:
-                        continue                 
-
-if found_result == "false":
-        print "units:none " + "measuremnt:" + "0" + " result:fail"
diff --git a/netperf/singlenode-network.yaml b/netperf/singlenode-network.yaml
deleted file mode 100644
index 45d529f..0000000
--- a/netperf/singlenode-network.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-metadata:
-    format: Lava-Test Test Definition 1.0
-    name: netperf-multinode-client-napi
-    description: "Basic MultiNode netperf client test for Linux Linaro ubuntu Images"
-
-install:
-     steps:
-         - 'curl -o netperf-2.6.0.tar.gz ftp://ftp.netperf.org/netperf/netperf-2.6.0.tar.gz'
-         - 'tar --strip-components=1 -zxf netperf-2.6.0.tar.gz'
-         - 'mkdir build'
-         - './configure --prefix=$(readlink -f build)'
-         - 'make all'
-         - 'make SKIP_IDCHECK=1 install'
-     deps:
-         - gzip
-         - flex
-         - bison
-         - build-essential
-         - curl
-         - wget
-
-run:
-    steps:
-        - ifconfig eth0 down
-        - dhclient -v eth0
-        - ifconfig -a
-        - route
-- 
cgit v1.2.3