tests: Remove duplicated pre_run() code

pre_run() implementation was duplicated multiple times. Generalize it, and add it to the base module. Signed-off-by: Edward Srouji <[email protected]>
linux-rdma · Jun 12, 2023 · b001ba4 · b001ba4
1 parent 78f6a65
commit b001ba4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 34 deletions.
diff --git a/tests/base.py b/tests/base.py
@@ -680,12 +680,19 @@ def create_srq(self):
 
  def pre_run(self, rpsns, rqps_num):
  """
- Modify the QP's states to RTS and fill receive queue with <num_msgs> work
- requests.
- This method is not implemented in this class.
- :param rpsns: Remote PSNs
+ Configure resources before running traffic and modifies the QP to RTS
+ if required.
+ :param rpsns: Remote PSNs (packet serial numbers)
  :param rqps_num: Remote QPs Number
- :return: None
+ """
+ self.rpsns = rpsns
+ self.rqps_num = rqps_num
+ self.to_rts()
+
+ def to_rts(self):
+ """
+ Modify the QP's states to RTS and initialize it to be ready for traffic.
+ If not required, can be "passed" but must be implemented.
  """
  raise NotImplementedError()
 
@@ -720,17 +727,6 @@ def to_rts(self):
  attr.sq_psn = self.rpsns[i]
  self.qps[i].to_rts(attr)
 
- def pre_run(self, rpsns, rqps_num):
- """
- Configure Resources before running traffic
- :param rpsns: Remote PSNs (packet serial number)
- :param rqps_num: Remote QPs number
- :return: None
- """
- self.rpsns = rpsns
- self.rqps_num = rqps_num
- self.to_rts()
-
 
 class UDResources(RoCETrafficResources):
  UD_QKEY = 0x11111111
@@ -761,9 +757,8 @@ def create_qps(self):
  raise unittest.SkipTest(f'Create QP type {qp_init_attr.qp_type} is not supported')
  raise ex
 
- def pre_run(self, rpsns, rqps_num):
- self.rpsns = rpsns
- self.rqps_num = rqps_num
+ def to_rts(self):
+ pass
 
 
 class RawResources(TrafficResources):
@@ -878,8 +873,3 @@ def init_resources(self):
  self.create_xrcd()
  super(XRCResources, self).init_resources()
  self.create_srq()
-
- def pre_run(self, rpsns, rqps_num):
- self.rqps_num = rqps_num
- self.rpsns = rpsns
- self.to_rts()
diff --git a/tests/efa_base.py b/tests/efa_base.py
@@ -52,11 +52,6 @@ def __init__(self, dev_name, ib_port, gid_index, send_ops_flags,
  self.send_ops_flags = send_ops_flags
  super().__init__(dev_name, ib_port, gid_index, qp_count=qp_count)
 
- def pre_run(self, rpsns, rqps_num):
- self.rpsns = rpsns
- self.rqps_num = rqps_num
- self.to_rts()
-
  def create_qp_attr(self):
  attr = QPAttr(port_num=self.ib_port)
  attr.qkey = self.SRD_QKEY

diff --git a/tests/mlx5_base.py b/tests/mlx5_base.py
@@ -128,11 +128,6 @@ def to_rts(self):
  self.qps[i].to_rts(attr)
  self.dct_qp.to_rtr(attr)
 
- def pre_run(self, rpsns, rqps_num):
- self.rpsns = rpsns
- self.rqps_num = rqps_num
- self.to_rts()
-
  def create_context(self):
  mlx5dv_attr = Mlx5DVContextAttr()
  try: