Change targetcli to use new package import names

Since rtslib-fb and configshell-fb have different APIs from the original
rtslib and configshell, we're trying to move off those package names since
it can cause user confusion. Change our version of targetcli to indicate it
requires the -fb versions.

Signed-off-by: Andy Grover <agrover@redhat.com>

5 files changed, 17 insertions, 17 deletions

diff --git a/scripts/targetcli b/scripts/targetcli
index 10fcebc..b95e842 100755
--- a/scripts/targetcli
+++ b/scripts/targetcli
@@ -22,8 +22,8 @@ from __future__ import print_function
 
 from os import getuid
 from targetcli import UIRoot
-from rtslib import RTSLibError
-from configshell import ConfigShell, ExecutionError
+from rtslib_fb import RTSLibError
+from configshell_fb import ConfigShell, ExecutionError
 import sys
 from targetcli import __version__ as targetcli_version
 
diff --git a/targetcli/ui_backstore.py b/targetcli/ui_backstore.py
index f098fd9..5d30e5b 100644
--- a/targetcli/ui_backstore.py
+++ b/targetcli/ui_backstore.py
@@ -18,12 +18,12 @@ under the License.
 '''
 
 from ui_node import UINode, UIRTSLibNode
-from rtslib import RTSRoot
-from rtslib import FileIOStorageObject, BlockStorageObject
-from rtslib import PSCSIStorageObject, RDMCPStorageObject, UserBackedStorageObject
-from rtslib import RTSLibError
-from rtslib.utils import get_block_type
-from configshell import ExecutionError
+from rtslib_fb import RTSRoot
+from rtslib_fb import FileIOStorageObject, BlockStorageObject
+from rtslib_fb import PSCSIStorageObject, RDMCPStorageObject, UserBackedStorageObject
+from rtslib_fb import RTSLibError
+from rtslib_fb.utils import get_block_type
+from configshell_fb import ExecutionError
 import glob
 import os
 import stat
diff --git a/targetcli/ui_node.py b/targetcli/ui_node.py
index cfa7b11..53c095f 100644
--- a/targetcli/ui_node.py
+++ b/targetcli/ui_node.py
@@ -17,8 +17,8 @@ License for the specific language governing permissions and limitations
 under the License.
 '''
 
-from configshell import ConfigNode, ExecutionError
-from rtslib import RTSLibError, RTSRoot
+from configshell_fb import ConfigNode, ExecutionError
+from rtslib_fb import RTSLibError, RTSRoot
 
 class UINode(ConfigNode):
     '''
diff --git a/targetcli/ui_root.py b/targetcli/ui_root.py
index 80e875e..3f77567 100644
--- a/targetcli/ui_root.py
+++ b/targetcli/ui_root.py
@@ -17,9 +17,9 @@ License for the specific language governing permissions and limitations
 under the License.
 '''
 
-from rtslib import RTSRoot
-from rtslib.utils import ignored
-from configshell import ExecutionError
+from rtslib_fb import RTSRoot
+from rtslib_fb.utils import ignored
+from configshell_fb import ExecutionError
 from ui_node import UINode
 from socket import gethostname
 from ui_target import UIFabricModule
diff --git a/targetcli/ui_target.py b/targetcli/ui_target.py
index bb4fa61..5c8e2f4 100644
--- a/targetcli/ui_target.py
+++ b/targetcli/ui_target.py
@@ -19,10 +19,10 @@ under the License.
 
 from ui_node import UINode, UIRTSLibNode
 from ui_backstore import complete_path
-from rtslib import RTSLibError, RTSLibBrokenLink, utils
-from rtslib import NodeACL, NetworkPortal, MappedLUN
-from rtslib import Target, TPG, LUN, StorageObjectFactory
-from configshell import ExecutionError
+from rtslib_fb import RTSLibError, RTSLibBrokenLink, utils
+from rtslib_fb import NodeACL, NetworkPortal, MappedLUN
+from rtslib_fb import Target, TPG, LUN, StorageObjectFactory
+from configshell_fb import ExecutionError
 import os
 import stat
 try: