Stop using the deprecated salt.transport.client imports.

Fixes #64186

Signed-off-by: Pedro Algarvio <[email protected]>

changelog/64186.fixed.md

@@ -0,0 +1 @@
+Stop using the deprecated `salt.transport.client` imports.

salt/minion.py

@@ -1363,7 +1363,7 @@ def connect_master(self, failed=False):
         )
 
         # a long-running req channel
-        self.req_channel = salt.transport.client.AsyncReqChannel.factory(
+        self.req_channel = salt.channel.client.AsyncReqChannel.factory(
             self.opts, io_loop=self.io_loop
         )
 
@@ -2817,10 +2817,8 @@ def handle_event(self, package):
                             self.opts["master"],
                         )
 
-                        self.req_channel = (
-                            salt.transport.client.AsyncReqChannel.factory(
-                                self.opts, io_loop=self.io_loop
-                            )
+                        self.req_channel = salt.channel.client.AsyncReqChannel.factory(
+                            self.opts, io_loop=self.io_loop
                         )
 
                         # put the current schedule into the new loaders

salt/transport/client.py

@@ -13,8 +13,6 @@
 
 log = logging.getLogger(__name__)
 
-# XXX: Add depreication warnings to start using salt.channel.client
-
 
 class ReqChannel:
     """

salt/transport/ipc.py

@@ -13,7 +13,6 @@
 import salt.ext.tornado.gen
 import salt.ext.tornado.ioloop
 import salt.ext.tornado.netutil
-import salt.transport.client
 import salt.transport.frame
 import salt.utils.msgpack
 from salt.ext.tornado.ioloop import IOLoop

salt/transport/local.py

@@ -1,7 +1,7 @@
 import logging
 
 import salt.utils.files
-from salt.transport.client import ReqChannel
+from salt.channel.client import ReqChannel
 
 log = logging.getLogger(__name__)
 

salt/transport/tcp.py

@@ -25,10 +25,8 @@
 import salt.ext.tornado.tcpserver
 import salt.master
 import salt.payload
-import salt.transport.client
 import salt.transport.frame
 import salt.transport.ipc
-import salt.transport.server
 import salt.utils.asynchronous
 import salt.utils.files
 import salt.utils.msgpack

tests/pytests/functional/transport/server/test_req_channel.py

@@ -11,8 +11,6 @@
 import salt.exceptions
 import salt.ext.tornado.gen
 import salt.master
-import salt.transport.client
-import salt.transport.server
 import salt.utils.platform
 import salt.utils.process
 import salt.utils.stringutils