diff options
Diffstat (limited to 'tests/2-nodes-vpp-bridge.yml')
| -rw-r--r-- | tests/2-nodes-vpp-bridge.yml | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/tests/2-nodes-vpp-bridge.yml b/tests/2-nodes-vpp-bridge.yml index 55349f798..8c62f6be8 100644 --- a/tests/2-nodes-vpp-bridge.yml +++ b/tests/2-nodes-vpp-bridge.yml @@ -2,6 +2,11 @@ version: "3" services: client: container_name: ${TEST_VPP_BRIDGE}-client + cap_add: + - NET_ADMIN + devices: + - /dev/net/tun:/dev/net/tun + - /dev/vhost-net:/dev/vhost-net command: - | if [ -d /workspace/build-dev ]; then @@ -9,10 +14,10 @@ services: fi sudo ip link add br0 type bridge - sudo ip link set eth0 master br0 - sudo ip link set eth0 up sudo ip link set br0 up - sudo mkdir -p /var/log/vpp + sudo ip link set eth0 master br0 + sudo ip addr del ${TOPOLOGY_2_NODES_IP_ADDRESS_CLIENT}/24 dev eth0 + sudo tee /etc/vpp/startup.conf <<EOF cpu { main-core 1 } plugins { @@ -32,16 +37,16 @@ services: unix { startup-config /etc/vpp/client-up.txt cli-listen /run/vpp/cli.sock - log /var/log/vpp/vpp.log + log ${FORWARDER_LOG_PATH} } EOF sudo tee /etc/vpp/client-up.txt <<EOF create tap id 0 host-bridge br0 set int state tap0 up - set int ip addr tap0 192.168.1.1/24 - set int ip addr tap0 2001::1/64 - ip route add b002::1/64 via 2001::2 tap0 + set int ip addr tap0 ${TOPOLOGY_2_NODES_IP_ADDRESS_CLIENT}/24 + set int ip addr tap0 ${TOPOLOGY_2_NODES_IP6_ADDRESS_CLIENT}/64 + ip route add b002::1/64 via ${TOPOLOGY_2_NODES_IP6_ADDRESS_SERVER} tap0 EOF sudo vpp -c /etc/vpp/startup.conf @@ -52,6 +57,11 @@ services: server: container_name: ${TEST_VPP_BRIDGE}-server + cap_add: + - NET_ADMIN + devices: + - /dev/net/tun:/dev/net/tun + - /dev/vhost-net:/dev/vhost-net command: - | if [ -d /workspace/build-dev ]; then @@ -59,10 +69,10 @@ services: fi sudo ip link add br0 type bridge - sudo ip link set eth0 master br0 - sudo ip link set eth0 up sudo ip link set br0 up - sudo mkdir -p /var/log/vpp + sudo ip link set eth0 master br0 + sudo ip addr del ${TOPOLOGY_2_NODES_IP_ADDRESS_SERVER}/24 dev eth0 + sudo tee /etc/vpp/startup.conf <<EOF cpu { main-core 2 } plugins { @@ -81,14 +91,15 @@ services: unix { startup-config /etc/vpp/server-up.txt cli-listen /run/vpp/cli.sock - log /var/log/vpp/vpp.log + log ${FORWARDER_LOG_PATH} } EOF + sudo tee /etc/vpp/server-up.txt <<EOF create tap id 0 host-bridge br0 set int state tap0 up - set int ip addr tap0 192.168.1.12/24 - set int ip addr tap0 2001::2/64 + set int ip addr tap0 ${TOPOLOGY_2_NODES_IP_ADDRESS_SERVER}/24 + set int ip addr tap0 ${TOPOLOGY_2_NODES_IP6_ADDRESS_SERVER}/64 EOF sudo vpp -c /etc/vpp/startup.conf |