15b0fb3a71
Expand the traffic generator container into two: - traffic-generator-nvme, which uses NVMe-oF to connect to proxy-container - traffic-generator-virtio, which uses Virtio to connect to proxy-container Added second device Malloc device in storage-target, and second subsystem shared between storage-target and proxy-container. The proxy-container and traffic-generator-virtio share named volume in order to pass the vhost socket file. Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Change-Id: I889dc19f523255f10b22e15f5e5f437b33ae796d Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9667 Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Xiaodong Liu <xiaodong.liu@intel.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
81 lines
1.9 KiB
YAML
81 lines
1.9 KiB
YAML
# SPDX-License-Identifier: Apache-2.0
|
|
# Copyright (c) Intel Corporation
|
|
version: "3.8"
|
|
services:
|
|
build_base:
|
|
image: spdk
|
|
build:
|
|
context: build_base
|
|
container_name: build_base
|
|
storage-target:
|
|
image: spdk-app
|
|
build:
|
|
context: spdk-app
|
|
container_name: storage-target
|
|
depends_on:
|
|
- build_base
|
|
networks:
|
|
spdk:
|
|
ipv4_address: 192.168.42.2
|
|
volumes:
|
|
- /dev/hugepages:/dev/hugepages
|
|
- ./spdk-app/storage-target.conf:/config
|
|
environment:
|
|
- SPDK_ARGS=-m 0x2
|
|
privileged: true
|
|
proxy-container:
|
|
image: spdk-app
|
|
build:
|
|
context: spdk-app
|
|
container_name: proxy-container
|
|
depends_on:
|
|
- storage-target
|
|
networks:
|
|
spdk:
|
|
ipv4_address: 192.168.42.3
|
|
volumes:
|
|
- /dev/hugepages:/dev/hugepages
|
|
- ./spdk-app/proxy-container.conf:/config
|
|
- vhost-user:/vhost-user
|
|
environment:
|
|
- SPDK_ARGS=-m 0x4 -S /vhost-user
|
|
privileged: true
|
|
traffic-generator-virtio:
|
|
image: traffic-generator
|
|
build:
|
|
context: traffic-generator
|
|
container_name: traffic-generator-virtio
|
|
depends_on:
|
|
- proxy-container
|
|
networks:
|
|
spdk:
|
|
volumes:
|
|
- /dev/hugepages:/dev/hugepages
|
|
- ./traffic-generator/conf-virtio:/config
|
|
- vhost-user:/vhost-user
|
|
- ./traffic-generator/fio-virtio.conf:/fio.conf
|
|
privileged: true
|
|
traffic-generator-nvme:
|
|
image: traffic-generator
|
|
build:
|
|
context: traffic-generator
|
|
container_name: traffic-generator-nvme
|
|
depends_on:
|
|
- proxy-container
|
|
networks:
|
|
spdk:
|
|
volumes:
|
|
- /dev/hugepages:/dev/hugepages
|
|
- ./traffic-generator/conf-nvme:/config
|
|
- ./traffic-generator/fio-nvme.conf:/fio.conf
|
|
privileged: true
|
|
networks:
|
|
spdk:
|
|
name: "spdk"
|
|
ipam:
|
|
config:
|
|
- subnet: 192.168.42.0/29
|
|
gateway: 192.168.42.1
|
|
volumes:
|
|
vhost-user:
|