Commit 9bacb862 authored by Karol Latecki's avatar Karol Latecki Committed by Jim Harris
Browse files

scripts/nvmf_perf: rename remote_nic_ips 



Rename to target_nic_ip to better match NVMe-oF
terminology.

Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Change-Id: I0644410cfb063eeea740c54f5860aeefdb52d52d
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7089


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent ad783359

scripts/perf/nvmf/README.md

+2 −2
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ There can be one or more `initiatorX` setting sections, depending on the test se 
"initiator1": {

  "ip": "10.0.0.1",

  "nic_ips": ["192.0.1.2"],

  "remote_nic_ips": ["192.0.1.1"],

  "target_nic_ips": ["192.0.1.1"],

  "mode": "spdk",

  "fio_bin": "/path/to/fio/bin",

  "nvmecli_bin": "/path/to/nvmecli/bin",
@@ -176,7 +176,7 @@ Required: 
- ip - management IP address of initiator system to set up SSH connection.

- nic_ips - list of IP addresses of NIC ports to be used in test,

  local to given initiator system.

- remote_nic_ips - list of IP addresses of Target NIC ports to which initiator

- target_nic_ips - list of IP addresses of Target NIC ports to which initiator

  will attempt to connect to.

- mode - initiator mode, "spdk" or "kernel". For SPDK, the bdev fio plugin

  will be used to connect to NVMe-oF subsystems and submit I/O. For "kernel",

scripts/perf/nvmf/run_nvmf.py

+4 −4
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ class Initiator(Server): 


        # Required fields

        self.ip = initiator_config["ip"]

        self.remote_nic_ips = initiator_config["remote_nic_ips"]

        self.target_nic_ips = initiator_config["target_nic_ips"]



        # Defaults

        self.cpus_allowed = None
@@ -1354,7 +1354,7 @@ if __name__ == "__main__": 
        pass



    for i in initiators:

        i.discover_subsystems(i.remote_nic_ips, target_obj.subsys_no)

        i.discover_subsystems(i.target_nic_ips, target_obj.subsys_no)

        if i.enable_adq:

            i.adq_configure_tc()
@@ -1365,7 +1365,7 @@ if __name__ == "__main__": 
        configs = []

        for i in initiators:

            if i.mode == "kernel":

                i.kernel_init_connect(i.remote_nic_ips, target_obj.subsys_no)

                i.kernel_init_connect(i.target_nic_ips, target_obj.subsys_no)



            cfg = i.gen_fio_config(rw, fio_rw_mix_read, block_size, io_depth, target_obj.subsys_no,

                                   fio_num_jobs, fio_ramp_time, fio_run_time)
@@ -1408,7 +1408,7 @@ if __name__ == "__main__": 


        for i in initiators:

            if i.mode == "kernel":

                i.kernel_init_disconnect(i.remote_nic_ips, target_obj.subsys_no)

                i.kernel_init_disconnect(i.target_nic_ips, target_obj.subsys_no)

            i.copy_result_files(target_results_dir)



    target_obj.restore_governor()