Merge branch 'stable/1710' of https://gerrit.fd.io/r/vpp into 17101710

6 files changed, 173 insertions, 0 deletions

diff --git a/src/scripts/vnet/uri/afp_setup.cli b/src/scripts/vnet/uri/afp_setup.cli
new file mode 100644
index 00000000..c29afc6f
--- /dev/null
+++ b/src/scripts/vnet/uri/afp_setup.cli
@@ -0,0 +1,5 @@
+create host-interface name vpp1
+set int state host-vpp1 up
+set int ip address host-vpp1 6.0.1.1/24
+trace add af-packet-input 10
+session enable
diff --git a/src/scripts/vnet/uri/dpdk_setup.cli b/src/scripts/vnet/uri/dpdk_setup.cli
new file mode 100644
index 00000000..02bba58f
--- /dev/null
+++ b/src/scripts/vnet/uri/dpdk_setup.cli
@@ -0,0 +1,4 @@
+set int state GigabitEthernet1b/0/0 up
+set int ip address GigabitEthernet1b/0/0 6.0.1.1/24
+trace add dpdk-input 10
+session enable
diff --git a/src/scripts/vnet/uri/dummy_app.py b/src/scripts/vnet/uri/dummy_app.py
new file mode 100644
index 00000000..ff00f2fc
--- /dev/null
+++ b/src/scripts/vnet/uri/dummy_app.py
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+
+import socket
+import sys
+import time
+
+# action can be reflect or drop 
+action = "drop"
+test = 0
+
+def test_data (data, n_rcvd):
+    n_read = len (data);
+    for i in range(n_read):
+        expected = (n_rcvd + i) & 0xff
+        byte_got = ord (data[i])
+        if (byte_got != expected):
+            print("Difference at byte {}. Expected {} got {}"
+                  .format(n_rcvd + i, expected, byte_got))
+    return n_read
+
+def handle_connection (connection, client_address):
+    print("Received connection from {}".format(repr(client_address)))
+    n_rcvd = 0
+    try:
+        while True:
+            data = connection.recv(4096)
+            if not data:
+                break;
+            if (test == 1):
+                n_rcvd += test_data (data, n_rcvd)
+            if (action != "drop"):
+                connection.sendall(data)
+    finally:
+        connection.close()
+        
+def run_server(ip, port):
+    print("Starting server {}:{}".format(repr(ip), repr(port)))
+    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+    server_address = (ip, int(port))
+    sock.bind(server_address)
+    sock.listen(1)
+    
+    while True:
+        connection, client_address = sock.accept()
+        handle_connection (connection, client_address)
+
+def prepare_data():
+    buf = []
+    for i in range (0, pow(2, 16)):
+        buf.append(i & 0xff)
+    return bytearray(buf)
+
+def run_client(ip, port):
+    print("Starting client {}:{}".format(repr(ip), repr(port)))
+    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    server_address = (ip, port)
+    sock.connect(server_address)
+    
+    data = prepare_data()
+    n_rcvd = 0
+    n_sent = len (data)
+    try:
+        sock.sendall(data)
+        
+        timeout = time.time() + 2
+        while n_rcvd < n_sent and time.time() < timeout:
+            tmp = sock.recv(1500)
+            tmp = bytearray (tmp)
+            n_read = len(tmp)
+            for i in range(n_read):
+                if (data[n_rcvd + i] != tmp[i]):
+                    print("Difference at byte {}. Sent {} got {}"
+                          .format(n_rcvd + i, data[n_rcvd + i], tmp[i]))
+            n_rcvd += n_read
+            
+        if (n_rcvd < n_sent or n_rcvd > n_sent):
+            print("Sent {} and got back {}".format(n_sent, n_rcvd))
+        else:
+            print("Got back what we've sent!!");
+            
+    finally:
+        sock.close()
+    
+def run(mode, ip, port):
+    if (mode == "server"):
+        run_server (ip, port)
+    elif (mode == "client"):
+        run_client (ip, port)
+    else:
+        raise Exception("Unknown mode. Only client and server supported")
+
+if __name__ == "__main__":
+    if (len(sys.argv)) < 4:
+        raise Exception("Usage: ./dummy_app <mode> <ip> <port> [<action> <test>]")
+    if (len(sys.argv) == 6):
+        action = sys.argv[4]
+        test = int(sys.argv[5])
+
+    run (sys.argv[1], sys.argv[2], int(sys.argv[3]))
diff --git a/src/scripts/vnet/uri/tap_setup.cli b/src/scripts/vnet/uri/tap_setup.cli
new file mode 100644
index 00000000..1d9a1b36
--- /dev/null
+++ b/src/scripts/vnet/uri/tap_setup.cli
@@ -0,0 +1,5 @@
+tap connect tap0 address 6.0.1.2/24
+set int ip addr tap-0 6.0.1.1/24
+set int state tap-0 up
+trace add tapcli-rx 10
+session enable
diff --git a/src/scripts/vnet/uri/tcp-setup.sh b/src/scripts/vnet/uri/tcp-setup.sh
new file mode 100755
index 00000000..e0b01588
--- /dev/null
+++ b/src/scripts/vnet/uri/tcp-setup.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+function topo_setup
+{
+  ip netns add vppns1
+  ip link add veth_vpp1 type veth peer name vpp1
+  ip link set dev vpp1 up
+  ip link set dev veth_vpp1 up netns vppns1
+
+  ip netns exec vppns1                          \
+  bash -c "
+    ip link set dev lo up
+    ip addr add 6.0.1.2/24 dev veth_vpp1
+  "
+
+  ethtool --offload  vpp1 rx off tx off
+  ip netns exec vppns1 ethtool --offload veth_vpp1 rx off tx off
+
+}
+
+function topo_clean
+{
+  ip link del dev veth_vpp1 &> /dev/null
+  ip netns del vppns1 &> /dev/null
+}
+
+if [ "$1" == "clean" ] ; then
+  topo_clean
+    exit 0
+else
+  topo_setup
+fi
+
+# to test connectivity do:
+# sudo ip netns exec vppns1 telnet 6.0.1.1 1234
+# to push traffic to the server
+# dd if=/dev/zero bs=1024K count=512 | nc 6.0.1.1
+# to listen for incoming connection from vpp
+# nc -l 1234
diff --git a/src/scripts/vnet/uri/udp b/src/scripts/vnet/uri/udp
new file mode 100644
index 00000000..c7628f49
--- /dev/null
+++ b/src/scripts/vnet/uri/udp
@@ -0,0 +1,20 @@
+loop create
+set int ip address loop0 6.0.0.1/32
+set int state loop0 up
+
+packet-generator new {
+  name udp
+  limit 512
+  rate 1e4
+  node ip4-input
+  size 100-100
+  interface loop0
+  no-recycle
+  data {
+   UDP: 192.168.1.2 - 192.168.2.255 -> 192.168.1.1
+   UDP: 4321 -> 1234
+    length 72
+    incrementing 100
+  }
+}
+session enable