Merge new_io and configure - update tests

Signed-off-by: Robert Baldyga <robert.baldyga@intel.com>

tests/functional/tests/basic/test_pyocf.py

@@ -32,10 +32,9 @@ def test_simple_wt_write(pyocf_ctx):
     core_device.reset_stats()
 
     write_data = Data.from_string("This is test data")
-    io = core.new_io()
+    io = core.new_io(cache.get_default_queue(), 20, write_data.size,
+                     IoDir.WRITE, 0, 0)
     io.set_data(write_data)
-    io.configure(20, write_data.size, IoDir.WRITE, 0, 0)
-    io.set_queue(cache.get_default_queue())
 
     cmpl = OcfCompletion([("err", c_int)])
     io.callback = cmpl.callback

tests/functional/tests/engine/test_wo.py

@@ -19,8 +19,6 @@ from pyocf.types.shared import OcfCompletion
 
 def __io(io, queue, address, size, data, direction):
     io.set_data(data, 0)
-    io.configure(address, size, direction, 0, 0)
-    io.set_queue(queue)
     completion = OcfCompletion([("err", c_int)])
     io.callback = completion.callback
     io.submit()
@@ -28,7 +26,8 @@ def __io(io, queue, address, size, data, direction):
     return int(completion.results['err'])
 
 
-def _io(io, queue, address, size, data, offset, direction):
+def _io(new_io, queue, address, size, data, offset, direction):
+    io = new_io(queue, address, size, direction, 0, 0)
     if direction == IoDir.READ:
         _data = Data.from_bytes(bytes(size))
     else:
@@ -40,12 +39,12 @@ def _io(io, queue, address, size, data, offset, direction):
 
 
 def io_to_core(core, address, size, data, offset, direction):
-    return _io(core.new_core_io(), core.cache.get_default_queue(), address, size,
+    return _io(core.new_core_io, core.cache.get_default_queue(), address, size,
                data, offset, direction)
 
 
 def io_to_exp_obj(core, address, size, data, offset, direction):
-    return _io(core.new_io(), core.cache.get_default_queue(), address, size, data,
+    return _io(core.new_io, core.cache.get_default_queue(), address, size, data,
                offset, direction)
 
 

tests/functional/tests/management/test_add_remove.py

@@ -101,10 +101,10 @@ def test_10add_remove_with_io(pyocf_ctx):
         assert stats["conf"]["core_count"] == 1
 
         write_data = Data.from_string("Test data")
-        io = core.new_io()
+        io = core.new_io(
+            cache.get_default_queue(), 20, write_data.size, IoDir.WRITE, 0, 0
+        )
         io.set_data(write_data)
-        io.configure(20, write_data.size, IoDir.WRITE, 0, 0)
-        io.set_queue(cache.get_default_queue())
 
         cmpl = OcfCompletion([("err", c_int)])
         io.callback = cmpl.callback

tests/functional/tests/management/test_start_stop.py

@@ -372,10 +372,10 @@ def run_io_and_cache_data_if_possible(exported_obj, mode, cls, cls_no):
 
 
 def io_to_core(exported_obj: Core, data: Data, offset: int, to_core_device=False):
-    io = exported_obj.new_core_io() if to_core_device else exported_obj.new_io()
+    new_io = exported_obj.new_core_io if to_core_device else exported_obj.new_io
+    io = new_io(exported_obj.cache.get_default_queue(), offset, data.size,
+                IoDir.WRITE, 0, 0)
     io.set_data(data)
-    io.configure(offset, data.size, IoDir.WRITE, 0, 0)
-    io.set_queue(exported_obj.cache.get_default_queue())
 
     completion = OcfCompletion([("err", c_int)])
     io.callback = completion.callback
@@ -387,10 +387,9 @@ def io_to_core(exported_obj: Core, data: Data, offset: int, to_core_device=False
 
 def io_from_exported_object(exported_obj: Core, buffer_size: int, offset: int):
     read_buffer = Data(buffer_size)
-    io = exported_obj.new_io()
-    io.configure(offset, read_buffer.size, IoDir.READ, 0, 0)
+    io = exported_obj.new_io(exported_obj.cache.get_default_queue(), offset,
+                             read_buffer.size, IoDir.READ, 0, 0)
     io.set_data(read_buffer)
-    io.set_queue(exported_obj.cache.get_default_queue())
 
     completion = OcfCompletion([("err", c_int)])
     io.callback = completion.callback

tests/functional/tests/security/test_negative_io.py

@@ -164,10 +164,9 @@ def prepare_cache_and_core(core_size: Size, cache_size: Size = Size.from_MiB(20)
 
 
 def io_operation(core: Core, data: Data, io_direction: int, offset: int = 0, io_class: int = 0):
-    io = core.new_io()
+    io = core.new_io(core.cache.get_default_queue(), offset, data.size,
+                     io_direction, io_class, 0)
     io.set_data(data)
-    io.configure(offset, data.size, io_direction, io_class, 0)
-    io.set_queue(core.cache.get_default_queue())
 
     completion = OcfCompletion([("err", c_int)])
     io.callback = completion.callback

tests/functional/tests/security/test_secure_erase.py

@@ -87,10 +87,10 @@ def test_secure_erase_simple_io_read_misses(cache_mode):
     cache.add_core(core)
 
     write_data = Data.from_string("This is test data")
-    io = core.new_io()
+    io = core.new_io(
+        cache.get_default_queue(), 20, write_data.size, IoDir.WRITE, 0, 0
+    )
     io.set_data(write_data)
-    io.configure(20, write_data.size, IoDir.WRITE, 0, 0)
-    io.set_queue(cache.get_default_queue())
 
     cmpl = OcfCompletion([("err", c_int)])
     io.callback = cmpl.callback
@@ -100,12 +100,11 @@ def test_secure_erase_simple_io_read_misses(cache_mode):
     cmpls = []
     for i in range(100):
         read_data = Data(500)
-        io = core.new_io()
-        io.set_data(read_data)
-        io.configure(
-            (i * 1259) % int(core_device.size), read_data.size, IoDir.READ, 0, 0
+        io = core.new_io(
+            cache.get_default_queue(), (i * 1259) % int(core_device.size),
+            read_data.size, IoDir.READ, 0, 0
         )
-        io.set_queue(cache.get_default_queue())
+        io.set_data(read_data)
 
         cmpl = OcfCompletion([("err", c_int)])
         io.callback = cmpl.callback
@@ -116,10 +115,10 @@ def test_secure_erase_simple_io_read_misses(cache_mode):
         c.wait()
 
     write_data = Data.from_string("TEST DATA" * 100)
-    io = core.new_io()
+    io = core.new_io(
+        cache.get_default_queue(), 500, write_data.size, IoDir.WRITE, 0, 0
+    )
     io.set_data(write_data)
-    io.configure(500, write_data.size, IoDir.WRITE, 0, 0)
-    io.set_queue(cache.get_default_queue())
 
     cmpl = OcfCompletion([("err", c_int)])
     io.callback = cmpl.callback
@@ -169,12 +168,11 @@ def test_secure_erase_simple_io_cleaning():
     cmpls = []
     for i in range(10000):
         read_data = Data(S.from_KiB(120))
-        io = core.new_io()
-        io.set_data(read_data)
-        io.configure(
-            (i * 1259) % int(core_device.size), read_data.size, IoDir.WRITE, 0, 0
+        io = core.new_io(
+            cache.get_default_queue(), (i * 1259) % int(core_device.size),
+            read_data.size, IoDir.WRITE, 0, 0
         )
-        io.set_queue(cache.get_default_queue())
+        io.set_data(read_data)
 
         cmpl = OcfCompletion([("err", c_int)])
         io.callback = cmpl.callback