From db823ed6e9543741f6969ff160314093002e037e Mon Sep 17 00:00:00 2001 From: Maros Ondrejicka Date: Wed, 14 Dec 2022 16:30:04 +0100 Subject: hs-test: abstract away topology from test cases Definition of shared volumes and containers has been moved to yaml files to be together with network topology. Containers are automatically run at the beginning of each test case and stopped afterward. Type: test Signed-off-by: Maros Ondrejicka Change-Id: I264cbb4f1355f8bd7aade221e9609fb5b9bd693e --- extras/hs-test/topo-containers/2peerVeth.yaml | 31 +++++++++++++++++++++++++++ extras/hs-test/topo-containers/ns.yaml | 27 +++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100755 extras/hs-test/topo-containers/2peerVeth.yaml create mode 100755 extras/hs-test/topo-containers/ns.yaml (limited to 'extras/hs-test/topo-containers') diff --git a/extras/hs-test/topo-containers/2peerVeth.yaml b/extras/hs-test/topo-containers/2peerVeth.yaml new file mode 100755 index 00000000000..8262232eff8 --- /dev/null +++ b/extras/hs-test/topo-containers/2peerVeth.yaml @@ -0,0 +1,31 @@ +--- +volumes: + - server-share + - client-share + +containers: + - name: "server-vpp" + volumes: + - host-dir: "server-share" + container-dir: "/tmp/server-share" + is-default-work-dir: true + - host-dir: "/tmp/server" + container-dir: "/tmp/server" + - name: "client-vpp" + volumes: + - host-dir: "client-share" + container-dir: "/tmp/client-share" + is-default-work-dir: true + - host-dir: "/tmp/client" + container-dir: "/tmp/client" + - name: "server-application" + volumes: + - host-dir: "server-share" + container-dir: "/tmp/server-share" + is-default-work-dir: true + - name: "client-application" + volumes: + - host-dir: "client-share" + container-dir: "/tmp/client-share" + is-default-work-dir: true + diff --git a/extras/hs-test/topo-containers/ns.yaml b/extras/hs-test/topo-containers/ns.yaml new file mode 100755 index 00000000000..2cb4fdc80f4 --- /dev/null +++ b/extras/hs-test/topo-containers/ns.yaml @@ -0,0 +1,27 @@ +--- +volumes: + - shared-vol + +# $HST_DIR will be replaced during runtime by path to hs-test directory +containers: + - name: "vpp" + volumes: + - host-dir: "shared-vol" + container-dir: "/tmp/vpp" + is-default-work-dir: true + - name: "envoy" + volumes: + - host-dir: "$HST_DIR/envoy/proxy.yaml" + container-dir: "/etc/envoy/envoy.yaml" + - host-dir: "shared-vol" + container-dir: "/tmp/vpp-envoy" + is-default-work-dir: true + - host-dir: "$HST_DIR/envoy" + container-dir: "/tmp" + vars: + - name: "ENVOY_UID" + value: "0" + - name: "VCL_CONFIG" + value: "/tmp/vcl.conf" + image: "envoyproxy/envoy-contrib:v1.21-latest" + is-optional: true -- cgit 1.2.3-korg