From 27285e20433106933e92d3f9c6c7126b5f2facea Mon Sep 17 00:00:00 2001
From: Karol Latecki <karol.latecki@intel.com>
Date: Wed, 23 Nov 2022 12:41:13 +0100
Subject: [PATCH] scripts/nvmf_perf: move adq_configure_tc

Move ADQ traffic classess configuration after
Target has been configured. ADQ TC configuration
will rely on information generated by configuring
the target (e.g. port numbers).

Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Change-Id: I5f5c438525d742ceab473c28afdb68d39ff019b8
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15595
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Pawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: Jaroslaw Chachulski <jaroslawx.chachulski@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
---
 scripts/perf/nvmf/run_nvmf.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/perf/nvmf/run_nvmf.py b/scripts/perf/nvmf/run_nvmf.py
index 99ae963ac..9bc096607 100755
--- a/scripts/perf/nvmf/run_nvmf.py
+++ b/scripts/perf/nvmf/run_nvmf.py
@@ -1148,9 +1148,6 @@ class SPDKTarget(Target):
     def spdk_tgt_configure(self):
         self.log.info("Configuring SPDK NVMeOF target via RPC")
 
-        if self.enable_adq:
-            self.adq_configure_tc()
-
         # Create transport layer
         nvmf_transport_params = {
             "client": self.client,
@@ -1175,6 +1172,9 @@ class SPDKTarget(Target):
             self.spdk_tgt_add_nvme_conf()
             self.spdk_tgt_add_subsystem_conf(self.nic_ips)
 
+        if self.enable_adq:
+            self.adq_configure_tc()
+
         self.log.info("Done configuring SPDK NVMeOF Target")
 
     def spdk_tgt_add_nullblock(self, null_block_count):