diff --git a/.github/workflows/bdd.yml b/.github/workflows/bdd.yml
new file mode 100644
index 000000000..484040b31
--- /dev/null
+++ b/.github/workflows/bdd.yml
@@ -0,0 +1,61 @@
+name: BDD CI
+on:
+ workflow_call:
+
+env:
+ CARGO_TERM_COLOR: always
+ CARGO_INCREMENTAL: 0
+
+jobs:
+ bdd-tests:
+ runs-on: ubuntu-latest-16-cores
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ fetch-depth: 0
+ submodules: 'recursive'
+ - uses: DeterminateSystems/nix-installer-action@v14
+ - uses: DeterminateSystems/magic-nix-cache-action@v8
+ - name: Pre-populate nix-shell
+ run: |
+ export NIX_PATH=nixpkgs=$(jq '.nixpkgs.url' nix/sources.json -r)
+ echo "NIX_PATH=$NIX_PATH" >> $GITHUB_ENV
+ nix-shell --run "echo" shell.nix
+ - name: Handle Rust dependencies caching
+ uses: Swatinem/rust-cache@v2
+ - name: Build binaries
+ run: nix-shell --run "cargo build --bins --features=io-engine-testing"
+ - name: Setup Test Pre-Requisites
+ run: |
+ sudo sysctl -w vm.nr_hugepages=2560
+ sudo apt-get install linux-modules-extra-$(uname -r)
+ for module in nvme_tcp nbd nvme_rdma; do
+ sudo modprobe $module
+ done
+ # for the coredump check
+ sudo apt-get install gdb
+ - name: Setup VENV
+ run: nix-shell --run "./test/python/setup.sh"
+ - name: Run BDD Tests
+ run: |
+ echo "TEST_START_DATE=$(date +"%Y-%m-%d %H:%M:%S")" >> $GITHUB_ENV
+ nix-shell --run "./scripts/pytest-tests.sh"
+ - name: Test Report
+ if: always()
+ uses: pmeier/pytest-results-action@main
+ with:
+ path: test/python/reports/**/xunit-report.xml
+ summary: true
+ display-options: a
+ fail-on-empty: true
+ title: Test results
+ - name: Cleanup
+ if: always()
+ run: nix-shell --run "./scripts/pytest-tests.sh --clean-all-exit"
+ - name: Check Coredumps
+ run: sudo ./scripts/check-coredumps.sh --since "${TEST_START_DATE}"
+# debugging
+ # - name: Setup tmate session
+ # if: ${{ failure() }}
+ # timeout-minutes: 240
+ # uses: mxschmitt/action-tmate@v3
diff --git a/.github/workflows/image-pr.yml b/.github/workflows/image-pr.yml
new file mode 100644
index 000000000..ac13554fb
--- /dev/null
+++ b/.github/workflows/image-pr.yml
@@ -0,0 +1,19 @@
+name: ImageBuild CI
+on:
+ workflow_call:
+
+env:
+ CARGO_TERM_COLOR: always
+ CARGO_INCREMENTAL: 0
+
+jobs:
+ image-build-test:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: 'recursive'
+ - uses: DeterminateSystems/nix-installer-action@v14
+ - uses: DeterminateSystems/magic-nix-cache-action@v8
+ - name: Test building the release images
+ run: ./scripts/release.sh --skip-publish --build-bins
diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
new file mode 100644
index 000000000..7736b5f06
--- /dev/null
+++ b/.github/workflows/image.yml
@@ -0,0 +1,29 @@
+name: Image Push
+on:
+ push:
+ branches:
+ - develop
+ - 'release/**'
+ tags:
+ - 'v[0-9]+.[0-9]+.[0-9]+**'
+
+env:
+ CARGO_TERM_COLOR: always
+ CARGO_INCREMENTAL: 0
+
+jobs:
+ image-build-test:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: 'recursive'
+ - uses: DeterminateSystems/nix-installer-action@v14
+ - uses: DeterminateSystems/magic-nix-cache-action@v8
+ - name: Login to Docker Hub
+ uses: docker/login-action@v3
+ with:
+ username: ${{ vars.DOCKERHUB_USERNAME }}
+ password: ${{ secrets.DOCKERHUB_TOKEN }}
+ - name: Test building the release images
+ run: ./scripts/release.sh
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 000000000..467f460cd
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,32 @@
+name: Unit/Int CI
+on:
+ workflow_call:
+
+env:
+ CARGO_TERM_COLOR: always
+ CARGO_INCREMENTAL: 0
+
+jobs:
+ code-linter:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: 'recursive'
+ - uses: DeterminateSystems/nix-installer-action@v14
+ - uses: DeterminateSystems/magic-nix-cache-action@v8
+ - name: Pre-populate nix-shell
+ run: |
+ export NIX_PATH=nixpkgs=$(jq '.nixpkgs.url' nix/sources.json -r)
+ echo "NIX_PATH=$NIX_PATH" >> $GITHUB_ENV
+ nix-shell --run "echo" shell.nix
+ - name: Handle Rust dependencies caching
+ uses: Swatinem/rust-cache@v2
+ - name: Lint rust code
+ run: |
+ nix-shell --run "FMT_OPTS=--check ./scripts/rust-style.sh"
+ nix-shell --run "./scripts/rust-linter.sh"
+ - name: Lint JS code
+ run: nix-shell --run "./scripts/js-check.sh"
+ - name: Lint Nix code
+ run: nix-shell --run "nixpkgs-fmt --check ."
\ No newline at end of file
diff --git a/.github/workflows/nightly-ci.yml b/.github/workflows/nightly-ci.yml
new file mode 100644
index 000000000..396ff3e41
--- /dev/null
+++ b/.github/workflows/nightly-ci.yml
@@ -0,0 +1,15 @@
+name: Nightly CI
+on:
+ workflow_dispatch:
+
+jobs:
+ ci:
+ uses: ./.github/workflows/pr-ci.yml
+ nightly-ci:
+ if: ${{ success() }}
+ needs:
+ - ci
+ runs-on: ubuntu-latest
+ steps:
+ - name: CI succeeded
+ run: exit 0
diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml
new file mode 100644
index 000000000..2c569de05
--- /dev/null
+++ b/.github/workflows/pr-ci.yml
@@ -0,0 +1,27 @@
+name: Bors CI
+on:
+ push:
+ branches:
+ - staging
+ - trying
+
+jobs:
+ lint-ci:
+ uses: ./.github/workflows/lint.yml
+ int-ci:
+ uses: ./.github/workflows/unit-int.yml
+ bdd-ci:
+ uses: ./.github/workflows/bdd.yml
+ image-ci:
+ uses: ./.github/workflows/image-pr.yml
+ bors-ci:
+ if: ${{ success() }}
+ needs:
+ - lint-ci
+ - int-ci
+ - bdd-ci
+ - image-ci
+ runs-on: ubuntu-latest
+ steps:
+ - name: CI succeeded
+ run: exit 0
diff --git a/.github/workflows/unit-int.yml b/.github/workflows/unit-int.yml
new file mode 100644
index 000000000..f661ceae3
--- /dev/null
+++ b/.github/workflows/unit-int.yml
@@ -0,0 +1,75 @@
+name: Integration CI
+on:
+ workflow_call:
+
+env:
+ CARGO_TERM_COLOR: always
+ CARGO_INCREMENTAL: 0
+
+jobs:
+ int-tests:
+ runs-on: ubuntu-latest-16-cores
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ fetch-depth: 0
+ submodules: 'recursive'
+ - uses: DeterminateSystems/nix-installer-action@v14
+ - uses: DeterminateSystems/magic-nix-cache-action@v8
+ - name: Pre-populate nix-shell
+ run: |
+ export NIX_PATH=nixpkgs=$(jq '.nixpkgs.url' nix/sources.json -r)
+ echo "NIX_PATH=$NIX_PATH" >> $GITHUB_ENV
+ nix-shell --run "echo" shell.nix
+ - name: Handle Rust dependencies caching
+ uses: Swatinem/rust-cache@v2
+ with:
+ save-if: ${{ startsWith(github.ref_name, 'release/') || github.ref_name == 'develop' }}
+ - name: Build binaries
+ run: nix-shell --run "cargo build --bins --features=io-engine-testing"
+ - name: Setup Test Pre-Requisites
+ run: |
+ sudo sysctl -w vm.nr_hugepages=3584
+ sudo apt-get install linux-modules-extra-$(uname -r)
+ for module in nvme_tcp nbd nvme_rdma; do
+ sudo modprobe $module
+ done
+ sudo apt-get install gdb
+ - name: Run Rust Tests
+ run: |
+ echo "TEST_START_DATE=$(date +"%Y-%m-%d %H:%M:%S")" >> $GITHUB_ENV
+ nix-shell --run "./scripts/cargo-test.sh"
+ - name: Cleanup
+ if: always()
+ run: nix-shell --run "./scripts/clean-cargo-tests.sh"
+ - name: Check Coredumps
+ run: sudo ./scripts/check-coredumps.sh --since "${TEST_START_DATE}"
+ - name: Run JS Grpc Tests
+ run: |
+ echo "TEST_START_DATE=$(date +"%Y-%m-%d %H:%M:%S")" >> $GITHUB_ENV
+ nix-shell --run "./scripts/grpc-test.sh"
+ mkdir js-reports
+ for file in *-xunit-report.xml; do
+ echo "" > "js-reports/$file"
+ cat $file >> "js-reports/$file"
+ echo "" >> "js-reports/$file"
+ done
+ - name: Test Report
+ if: always()
+ uses: pmeier/pytest-results-action@main
+ with:
+ path: 'js-reports/*-xunit-report.xml'
+ summary: true
+ display-options: a
+ fail-on-empty: true
+ title: Test results
+ - name: Cleanup
+ if: always()
+ run: nix-shell --run "./scripts/clean-cargo-tests.sh"
+ - name: Check Coredumps
+ run: sudo ./scripts/check-coredumps.sh --since "${TEST_START_DATE}"
+# debugging
+ # - name: Setup tmate session
+ # if: ${{ failure() }}
+ # timeout-minutes: 240
+ # uses: mxschmitt/action-tmate@v3
diff --git a/io-engine-tests/src/lib.rs b/io-engine-tests/src/lib.rs
index ba87ed84c..023fa88dc 100644
--- a/io-engine-tests/src/lib.rs
+++ b/io-engine-tests/src/lib.rs
@@ -342,7 +342,7 @@ pub fn mount_and_get_md5(device: &str) -> Result {
pub fn fio_run_verify(device: &str) -> Result {
let (exit, stdout, stderr) = run_script::run(
r"
- fio --name=randrw --rw=randrw --ioengine=libaio --direct=1 --time_based=1 \
+ $FIO --name=randrw --rw=randrw --ioengine=libaio --direct=1 --time_based=1 \
--runtime=5 --bs=4k --verify=crc32 --group_reporting=1 --output-format=terse \
--verify_fatal=1 --verify_async=2 --filename=$1
",
@@ -511,11 +511,11 @@ pub async fn wait_for_rebuild(dst_uri: String, state: RebuildState, timeout: Dur
pub fn fio_verify_size(device: &str, size: u64) -> i32 {
let (exit, stdout, stderr) = run_script::run(
r"
- fio --thread=1 --numjobs=1 --iodepth=16 --bs=512 \
+ $FIO --thread=1 --numjobs=1 --iodepth=16 --bs=512 \
--direct=1 --ioengine=libaio --rw=randwrite --verify=crc32 \
--verify_fatal=1 --name=write_verify --filename=$1 --size=$2
- fio --thread=1 --numjobs=1 --iodepth=16 --bs=512 \
+ $FIO --thread=1 --numjobs=1 --iodepth=16 --bs=512 \
--direct=1 --ioengine=libaio --verify=crc32 --verify_only \
--verify_fatal=1 --name=verify --filename=$1
",
diff --git a/io-engine/.cargo/runner.sh b/io-engine/.cargo/runner.sh
index 5ae299df6..d8e2b246e 100755
--- a/io-engine/.cargo/runner.sh
+++ b/io-engine/.cargo/runner.sh
@@ -4,7 +4,7 @@
ARGS="${@}"
if [[ $EUID -ne 0 ]]; then
- MAYBE_SUDO='sudo -E'
+ MAYBE_SUDO='sudo -E --preserve-env=PATH'
else
MAYBE_SUDO=''
fi
diff --git a/io-engine/tests/ftl_mount_fs.rs b/io-engine/tests/ftl_mount_fs.rs
index 3ec61d863..d58e7d0ae 100644
--- a/io-engine/tests/ftl_mount_fs.rs
+++ b/io-engine/tests/ftl_mount_fs.rs
@@ -97,7 +97,7 @@ async fn ftl_mount_fs_multiple() {
pub fn csal_fio_run_verify(device: &str) -> Result {
let (exit, stdout, stderr) = run_script::run(
r#"
- fio --name=randrw --rw=randrw --ioengine=libaio --direct=1 --time_based=1 \
+ $FIO --name=randrw --rw=randrw --ioengine=libaio --direct=1 --time_based=1 \
--runtime=10 --bs=64k --verify=crc32 --group_reporting=1 \
--verify_fatal=1 --verify_async=2 --filename=$1
"#,
diff --git a/libnvme-rs/src/nvme_uri.rs b/libnvme-rs/src/nvme_uri.rs
index e257487b8..c14c0458f 100644
--- a/libnvme-rs/src/nvme_uri.rs
+++ b/libnvme-rs/src/nvme_uri.rs
@@ -347,6 +347,12 @@ impl NvmeTarget {
}
}
+impl Drop for NvmeTarget {
+ fn drop(&mut self) {
+ self.disconnect().ok();
+ }
+}
+
#[test]
fn nvme_parse_uri() {
let target = NvmeTarget::try_from("nvmf://1.2.3.4:1234/testnqn.what-ever.foo").unwrap();
diff --git a/scripts/grpc-test.sh b/scripts/grpc-test.sh
index 3958173d7..b97cacb9e 100755
--- a/scripts/grpc-test.sh
+++ b/scripts/grpc-test.sh
@@ -16,7 +16,7 @@ set -euxo pipefail
export PATH="$PATH:${HOME}/.cargo/bin"
export npm_config_jobs=$(nproc)
-cargo build --all
+cargo build --bins --features=io-engine-testing
cd "$(dirname "$0")/../test/grpc"
npm install --legacy-peer-deps
diff --git a/scripts/nvmx-test.sh b/scripts/nvmx-test.sh
deleted file mode 100755
index 66cad8f0b..000000000
--- a/scripts/nvmx-test.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/env bash
-cd mayastor || exit
-cargo test --lib -- --nocapture --test-threads=1
-cargo test --test block_device_nvmf -- --nocapture --test-threads=1
diff --git a/test/python/cross-grpc-version/nexus/docker-compose.yml b/test/python/cross-grpc-version/nexus/docker-compose.yml
index 908a0652b..ac78f50f9 100644
--- a/test/python/cross-grpc-version/nexus/docker-compose.yml
+++ b/test/python/cross-grpc-version/nexus/docker-compose.yml
@@ -8,7 +8,7 @@ services:
container_name: "ms0"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.2
+ - MY_POD_IP=10.1.0.2
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -16,7 +16,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 1,2 -r /tmp/ms0.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.2
+ ipv4_address: 10.1.0.2
cap_add:
# NUMA related
- SYS_ADMIN
@@ -36,7 +36,7 @@ services:
container_name: "ms1"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.3
+ - MY_POD_IP=10.1.0.3
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -44,7 +44,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 3,4 -r /tmp/ms1.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.3
+ ipv4_address: 10.1.0.3
cap_add:
# NUMA related
- SYS_ADMIN
@@ -66,4 +66,4 @@ networks:
ipam:
driver: default
config:
- - subnet: "10.0.0.0/16"
+ - subnet: "10.1.0.0/16"
diff --git a/test/python/cross-grpc-version/pool/docker-compose.yml b/test/python/cross-grpc-version/pool/docker-compose.yml
index 515a6aed3..c7b56cbf3 100644
--- a/test/python/cross-grpc-version/pool/docker-compose.yml
+++ b/test/python/cross-grpc-version/pool/docker-compose.yml
@@ -8,7 +8,7 @@ services:
container_name: "ms0"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.2
+ - MY_POD_IP=10.1.0.2
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -16,7 +16,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 1,2 -r /tmp/ms0.sock --env-context=--iova-mode=pa
networks:
mayastor_net:
- ipv4_address: 10.0.0.2
+ ipv4_address: 10.1.0.2
cap_add:
# NUMA related
- SYS_ADMIN
@@ -38,4 +38,4 @@ networks:
ipam:
driver: default
config:
- - subnet: "10.0.0.0/16"
+ - subnet: "10.1.0.0/16"
diff --git a/test/python/cross-grpc-version/rebuild/docker-compose.yml b/test/python/cross-grpc-version/rebuild/docker-compose.yml
index a9dfb650c..e6263fde5 100644
--- a/test/python/cross-grpc-version/rebuild/docker-compose.yml
+++ b/test/python/cross-grpc-version/rebuild/docker-compose.yml
@@ -8,7 +8,7 @@ services:
container_name: "ms0"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.2
+ - MY_POD_IP=10.1.0.2
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -16,7 +16,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 1,2 -r /tmp/ms0.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.2
+ ipv4_address: 10.1.0.2
cap_add:
# NUMA related
- SYS_ADMIN
@@ -38,4 +38,4 @@ networks:
ipam:
driver: default
config:
- - subnet: "10.0.0.0/16"
+ - subnet: "10.1.0.0/16"
diff --git a/test/python/cross-grpc-version/replica/docker-compose.yml b/test/python/cross-grpc-version/replica/docker-compose.yml
index dd1fae339..9dfb7597b 100644
--- a/test/python/cross-grpc-version/replica/docker-compose.yml
+++ b/test/python/cross-grpc-version/replica/docker-compose.yml
@@ -8,7 +8,7 @@ services:
container_name: "ms0"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.2
+ - MY_POD_IP=10.1.0.2
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -16,7 +16,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 0,1 -r /tmp/ms0.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.2
+ ipv4_address: 10.1.0.2
cap_add:
# NUMA related
- SYS_ADMIN
@@ -38,4 +38,4 @@ networks:
ipam:
driver: default
config:
- - subnet: "10.0.0.0/16"
+ - subnet: "10.1.0.0/16"
diff --git a/test/python/pool/docker-compose.yml b/test/python/pool/docker-compose.yml
index 98b2b9ff3..f3a7c632d 100644
--- a/test/python/pool/docker-compose.yml
+++ b/test/python/pool/docker-compose.yml
@@ -4,7 +4,7 @@ services:
container_name: "ms0"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.2
+ - MY_POD_IP=10.1.0.2
- NEXUS_NVMF_RESV_ENABLE=1
- RUST_LOG=mayastor=trace
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -12,7 +12,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 1,2 -r /tmp/ms0.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.2
+ ipv4_address: 10.1.0.2
privileged: true
volumes:
- ${SRCDIR}:${SRCDIR}
@@ -27,4 +27,4 @@ networks:
ipam:
driver: default
config:
- - subnet: "10.0.0.0/16"
+ - subnet: "10.1.0.0/16"
diff --git a/test/python/tests/ana_client/docker-compose.yml b/test/python/tests/ana_client/docker-compose.yml
index a55a0f544..eabad1624 100644
--- a/test/python/tests/ana_client/docker-compose.yml
+++ b/test/python/tests/ana_client/docker-compose.yml
@@ -8,7 +8,7 @@ services:
container_name: "ms0"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.2
+ - MY_POD_IP=10.1.0.2
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -16,7 +16,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 1,2 -r /tmp/ms0.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.2
+ ipv4_address: 10.1.0.2
cap_add:
# NUMA related
- SYS_ADMIN
@@ -36,7 +36,7 @@ services:
container_name: "ms1"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.3
+ - MY_POD_IP=10.1.0.3
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -44,7 +44,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 3,4 -r /tmp/ms1.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.3
+ ipv4_address: 10.1.0.3
cap_add:
# NUMA related
- SYS_ADMIN
@@ -64,7 +64,7 @@ services:
container_name: "ms2"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.4
+ - MY_POD_IP=10.1.0.4
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -72,7 +72,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 5,6 -r /tmp/ms2.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.4
+ ipv4_address: 10.1.0.4
cap_add:
# NUMA related
- SYS_ADMIN
@@ -92,7 +92,7 @@ services:
container_name: "ms3"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.5
+ - MY_POD_IP=10.1.0.5
- NVME_KATO_MS=1000
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
@@ -101,7 +101,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 0,7 -r /tmp/ms3.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.5
+ ipv4_address: 10.1.0.5
cap_add:
# NUMA related
- SYS_ADMIN
@@ -123,4 +123,4 @@ networks:
ipam:
driver: default
config:
- - subnet: "10.0.0.0/16"
+ - subnet: "10.1.0.0/16"
diff --git a/test/python/tests/cli_controller/docker-compose.yml b/test/python/tests/cli_controller/docker-compose.yml
index 797ae4e38..1603019b4 100644
--- a/test/python/tests/cli_controller/docker-compose.yml
+++ b/test/python/tests/cli_controller/docker-compose.yml
@@ -8,7 +8,7 @@ services:
container_name: "ms1"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.3
+ - MY_POD_IP=10.1.0.3
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -16,7 +16,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 3,4 -r /tmp/ms1.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.3
+ ipv4_address: 10.1.0.3
cap_add:
# NUMA related
- SYS_ADMIN
@@ -36,7 +36,7 @@ services:
container_name: "ms2"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.4
+ - MY_POD_IP=10.1.0.4
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -44,7 +44,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 5,6 -r /tmp/ms2.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.4
+ ipv4_address: 10.1.0.4
cap_add:
# NUMA related
- SYS_ADMIN
@@ -64,7 +64,7 @@ services:
container_name: "ms3"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.5
+ - MY_POD_IP=10.1.0.5
- NVME_KATO_MS=1000
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
@@ -73,7 +73,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 0,7 -r /tmp/ms3.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.5
+ ipv4_address: 10.1.0.5
cap_add:
# NUMA related
- SYS_ADMIN
@@ -95,4 +95,4 @@ networks:
ipam:
driver: default
config:
- - subnet: "10.0.0.0/16"
+ - subnet: "10.1.0.0/16"
diff --git a/test/python/tests/nexus/docker-compose.yml b/test/python/tests/nexus/docker-compose.yml
index 2f86c4a65..0af942129 100644
--- a/test/python/tests/nexus/docker-compose.yml
+++ b/test/python/tests/nexus/docker-compose.yml
@@ -8,7 +8,7 @@ services:
container_name: "ms0"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.2
+ - MY_POD_IP=10.1.0.2
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -16,7 +16,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 1 -r /tmp/ms0.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.2
+ ipv4_address: 10.1.0.2
cap_add:
# NUMA related
- SYS_ADMIN
@@ -36,7 +36,7 @@ services:
container_name: "ms1"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.3
+ - MY_POD_IP=10.1.0.3
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -44,7 +44,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 2 -r /tmp/ms1.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.3
+ ipv4_address: 10.1.0.3
cap_add:
# NUMA related
- SYS_ADMIN
@@ -64,7 +64,7 @@ services:
container_name: "ms2"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.4
+ - MY_POD_IP=10.1.0.4
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -72,7 +72,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 3 -r /tmp/ms2.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.4
+ ipv4_address: 10.1.0.4
cap_add:
# NUMA related
- SYS_ADMIN
@@ -92,7 +92,7 @@ services:
container_name: "ms3"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.5
+ - MY_POD_IP=10.1.0.5
- NVME_KATO_MS=1000
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
@@ -103,7 +103,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 4 -r /tmp/ms3.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.5
+ ipv4_address: 10.1.0.5
cap_add:
# NUMA related
- SYS_ADMIN
@@ -125,4 +125,4 @@ networks:
ipam:
driver: default
config:
- - subnet: "10.0.0.0/16"
+ - subnet: "10.1.0.0/16"
diff --git a/test/python/tests/nexus_fault/docker-compose.yml b/test/python/tests/nexus_fault/docker-compose.yml
index f207aa65d..7bbb012fa 100644
--- a/test/python/tests/nexus_fault/docker-compose.yml
+++ b/test/python/tests/nexus_fault/docker-compose.yml
@@ -8,7 +8,7 @@ services:
container_name: "ms0"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.2
+ - MY_POD_IP=10.1.0.2
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -16,7 +16,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 1 -r /tmp/ms0.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.2
+ ipv4_address: 10.1.0.2
cap_add:
# NUMA related
- SYS_ADMIN
@@ -36,7 +36,7 @@ services:
container_name: "ms1"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.3
+ - MY_POD_IP=10.1.0.3
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -44,7 +44,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 2 -r /tmp/ms1.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.3
+ ipv4_address: 10.1.0.3
cap_add:
# NUMA related
- SYS_ADMIN
@@ -67,4 +67,4 @@ networks:
ipam:
driver: default
config:
- - subnet: "10.0.0.0/16"
+ - subnet: "10.1.0.0/16"
diff --git a/test/python/tests/nexus_multipath/docker-compose.yml b/test/python/tests/nexus_multipath/docker-compose.yml
index a55a0f544..eabad1624 100644
--- a/test/python/tests/nexus_multipath/docker-compose.yml
+++ b/test/python/tests/nexus_multipath/docker-compose.yml
@@ -8,7 +8,7 @@ services:
container_name: "ms0"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.2
+ - MY_POD_IP=10.1.0.2
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -16,7 +16,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 1,2 -r /tmp/ms0.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.2
+ ipv4_address: 10.1.0.2
cap_add:
# NUMA related
- SYS_ADMIN
@@ -36,7 +36,7 @@ services:
container_name: "ms1"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.3
+ - MY_POD_IP=10.1.0.3
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -44,7 +44,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 3,4 -r /tmp/ms1.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.3
+ ipv4_address: 10.1.0.3
cap_add:
# NUMA related
- SYS_ADMIN
@@ -64,7 +64,7 @@ services:
container_name: "ms2"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.4
+ - MY_POD_IP=10.1.0.4
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -72,7 +72,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 5,6 -r /tmp/ms2.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.4
+ ipv4_address: 10.1.0.4
cap_add:
# NUMA related
- SYS_ADMIN
@@ -92,7 +92,7 @@ services:
container_name: "ms3"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.5
+ - MY_POD_IP=10.1.0.5
- NVME_KATO_MS=1000
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
@@ -101,7 +101,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 0,7 -r /tmp/ms3.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.5
+ ipv4_address: 10.1.0.5
cap_add:
# NUMA related
- SYS_ADMIN
@@ -123,4 +123,4 @@ networks:
ipam:
driver: default
config:
- - subnet: "10.0.0.0/16"
+ - subnet: "10.1.0.0/16"
diff --git a/test/python/tests/publish/docker-compose.yml b/test/python/tests/publish/docker-compose.yml
index f494889ea..8b119798b 100644
--- a/test/python/tests/publish/docker-compose.yml
+++ b/test/python/tests/publish/docker-compose.yml
@@ -8,7 +8,7 @@ services:
container_name: "ms0"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.2
+ - MY_POD_IP=10.1.0.2
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -16,7 +16,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 1,2 -r /tmp/ms0.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.2
+ ipv4_address: 10.1.0.2
cap_add:
# NUMA related
- SYS_ADMIN
@@ -36,7 +36,7 @@ services:
container_name: "ms1"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.3
+ - MY_POD_IP=10.1.0.3
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -44,7 +44,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 3,4 -r /tmp/ms1.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.3
+ ipv4_address: 10.1.0.3
cap_add:
# NUMA related
- SYS_ADMIN
@@ -66,4 +66,4 @@ networks:
ipam:
driver: default
config:
- - subnet: "10.0.0.0/16"
+ - subnet: "10.1.0.0/16"
diff --git a/test/python/tests/publish/test_bdd_nexus.py b/test/python/tests/publish/test_bdd_nexus.py
index 1917fc83b..0b2b86a3f 100644
--- a/test/python/tests/publish/test_bdd_nexus.py
+++ b/test/python/tests/publish/test_bdd_nexus.py
@@ -319,7 +319,7 @@ def attempt_to_create_nexus_with_child_uri_that_does_not_exist(
create_nexus(
nexus_uuid,
megabytes(64),
- nexus_children + [f"nvmf://10.0.0.2:8420/{nvme_nqn_prefix}:missing"],
+ nexus_children + [f"nvmf://10.1.0.2:8420/{nvme_nqn_prefix}:missing"],
)
assert error.value.code() == grpc.StatusCode.INVALID_ARGUMENT
diff --git a/test/python/tests/rebuild/docker-compose.yml b/test/python/tests/rebuild/docker-compose.yml
index e03cc0cc5..fbbc96ea7 100644
--- a/test/python/tests/rebuild/docker-compose.yml
+++ b/test/python/tests/rebuild/docker-compose.yml
@@ -8,7 +8,7 @@ services:
container_name: "ms0"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.2
+ - MY_POD_IP=10.1.0.2
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -16,7 +16,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 1,2 -r /tmp/ms0.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.2
+ ipv4_address: 10.1.0.2
cap_add:
# NUMA related
- SYS_ADMIN
@@ -38,4 +38,4 @@ networks:
ipam:
driver: default
config:
- - subnet: "10.0.0.0/16"
+ - subnet: "10.1.0.0/16"
diff --git a/test/python/tests/replica/docker-compose.yml b/test/python/tests/replica/docker-compose.yml
index e03cc0cc5..fbbc96ea7 100644
--- a/test/python/tests/replica/docker-compose.yml
+++ b/test/python/tests/replica/docker-compose.yml
@@ -8,7 +8,7 @@ services:
container_name: "ms0"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.2
+ - MY_POD_IP=10.1.0.2
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -16,7 +16,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 1,2 -r /tmp/ms0.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.2
+ ipv4_address: 10.1.0.2
cap_add:
# NUMA related
- SYS_ADMIN
@@ -38,4 +38,4 @@ networks:
ipam:
driver: default
config:
- - subnet: "10.0.0.0/16"
+ - subnet: "10.1.0.0/16"
diff --git a/test/python/tests/replica_uuid/docker-compose.yml b/test/python/tests/replica_uuid/docker-compose.yml
index e03cc0cc5..fbbc96ea7 100644
--- a/test/python/tests/replica_uuid/docker-compose.yml
+++ b/test/python/tests/replica_uuid/docker-compose.yml
@@ -8,7 +8,7 @@ services:
container_name: "ms0"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.2
+ - MY_POD_IP=10.1.0.2
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -16,7 +16,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 1,2 -r /tmp/ms0.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.2
+ ipv4_address: 10.1.0.2
cap_add:
# NUMA related
- SYS_ADMIN
@@ -38,4 +38,4 @@ networks:
ipam:
driver: default
config:
- - subnet: "10.0.0.0/16"
+ - subnet: "10.1.0.0/16"
diff --git a/test/python/tests/rpc/docker-compose.yml b/test/python/tests/rpc/docker-compose.yml
index 3175c21c9..5fd871f20 100644
--- a/test/python/tests/rpc/docker-compose.yml
+++ b/test/python/tests/rpc/docker-compose.yml
@@ -8,7 +8,7 @@ services:
container_name: "ms1"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.3
+ - MY_POD_IP=10.1.0.3
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -16,7 +16,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 3,4 -r /tmp/ms1.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.3
+ ipv4_address: 10.1.0.3
cap_add:
# NUMA related
- SYS_ADMIN
@@ -38,4 +38,4 @@ networks:
ipam:
driver: default
config:
- - subnet: "10.0.0.0/16"
+ - subnet: "10.1.0.0/16"
diff --git a/test/python/v1/nexus/docker-compose.yml b/test/python/v1/nexus/docker-compose.yml
index 4b11c9e43..c7850b7ac 100644
--- a/test/python/v1/nexus/docker-compose.yml
+++ b/test/python/v1/nexus/docker-compose.yml
@@ -8,7 +8,7 @@ services:
container_name: "ms0"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.2
+ - MY_POD_IP=10.1.0.2
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -16,7 +16,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 1,2 -r /tmp/ms0.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.2
+ ipv4_address: 10.1.0.2
cap_add:
# NUMA related
- SYS_ADMIN
@@ -36,7 +36,7 @@ services:
container_name: "ms1"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.3
+ - MY_POD_IP=10.1.0.3
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -44,7 +44,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 2 -r /tmp/ms1.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.3
+ ipv4_address: 10.1.0.3
cap_add:
# NUMA related
- SYS_ADMIN
@@ -64,7 +64,7 @@ services:
container_name: "ms2"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.4
+ - MY_POD_IP=10.1.0.4
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -72,7 +72,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 3 -r /tmp/ms2.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.4
+ ipv4_address: 10.1.0.4
cap_add:
# NUMA related
- SYS_ADMIN
@@ -92,7 +92,7 @@ services:
container_name: "ms3"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.5
+ - MY_POD_IP=10.1.0.5
- NVME_KATO_MS=1000
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
@@ -103,7 +103,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 4 -r /tmp/ms3.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.5
+ ipv4_address: 10.1.0.5
cap_add:
# NUMA related
- SYS_ADMIN
@@ -125,4 +125,4 @@ networks:
ipam:
driver: default
config:
- - subnet: "10.0.0.0/16"
+ - subnet: "10.1.0.0/16"
diff --git a/test/python/v1/pool/docker-compose.yml b/test/python/v1/pool/docker-compose.yml
index d42e8ccb9..44d66babf 100644
--- a/test/python/v1/pool/docker-compose.yml
+++ b/test/python/v1/pool/docker-compose.yml
@@ -8,7 +8,7 @@ services:
container_name: "ms0"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.2
+ - MY_POD_IP=10.1.0.2
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}:${LVM_BINS:-}
@@ -17,7 +17,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 1,2 -r /tmp/ms0.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.2
+ ipv4_address: 10.1.0.2
cap_add:
# NUMA related
- SYS_ADMIN
@@ -49,4 +49,4 @@ networks:
ipam:
driver: default
config:
- - subnet: "10.0.0.0/16"
+ - subnet: "10.1.0.0/16"
diff --git a/test/python/v1/rebuild/docker-compose.yml b/test/python/v1/rebuild/docker-compose.yml
index e03cc0cc5..fbbc96ea7 100644
--- a/test/python/v1/rebuild/docker-compose.yml
+++ b/test/python/v1/rebuild/docker-compose.yml
@@ -8,7 +8,7 @@ services:
container_name: "ms0"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.2
+ - MY_POD_IP=10.1.0.2
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
@@ -16,7 +16,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 1,2 -r /tmp/ms0.sock
networks:
mayastor_net:
- ipv4_address: 10.0.0.2
+ ipv4_address: 10.1.0.2
cap_add:
# NUMA related
- SYS_ADMIN
@@ -38,4 +38,4 @@ networks:
ipam:
driver: default
config:
- - subnet: "10.0.0.0/16"
+ - subnet: "10.1.0.0/16"
diff --git a/test/python/v1/replica/docker-compose.yml b/test/python/v1/replica/docker-compose.yml
index 0279a8e1f..345a288da 100644
--- a/test/python/v1/replica/docker-compose.yml
+++ b/test/python/v1/replica/docker-compose.yml
@@ -8,7 +8,7 @@ services:
container_name: "ms0"
image: rust:latest
environment:
- - MY_POD_IP=10.0.0.2
+ - MY_POD_IP=10.1.0.2
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}:${LVM_BINS:-}
@@ -18,7 +18,7 @@ services:
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 1 -r /tmp/ms0.sock --reactor-freeze-detection
networks:
mayastor_net:
- ipv4_address: 10.0.0.2
+ ipv4_address: 10.1.0.2
cap_add:
# NUMA related
- SYS_ADMIN
@@ -48,4 +48,4 @@ networks:
ipam:
driver: default
config:
- - subnet: "10.0.0.0/16"
+ - subnet: "10.1.0.0/16"