From f1e942fe8d202d751c4002eb1f9a35fd489b737e Mon Sep 17 00:00:00 2001
From: Sean McGinnis <sean.mcginnis@gmail.com>
Date: Thu, 14 Jun 2018 14:25:12 -0500
Subject: [PATCH] Get rid of conditional rtslib_fb imports

Newer versions of this library have been out for awhile now
and appear to be working well. This raises the minimum version
for rtslib_fb to a recent version that does not require the
conditional import due to the namespace change from rtslib to
rtslib_fb.

Depends-on: https://review.openstack.org/575530
Change-Id: I10f48833c2a61b7b2c6b300d4f8291a357f7e600
---
 cinder/cmd/rtstool.py         | 8 +-------
 cinder/tests/unit/test_cmd.py | 6 +-----
 lower-constraints.txt         | 2 +-
 requirements.txt              | 2 +-
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/cinder/cmd/rtstool.py b/cinder/cmd/rtstool.py
index 7713c685b12..ec065b1ff20 100644
--- a/cinder/cmd/rtstool.py
+++ b/cinder/cmd/rtstool.py
@@ -18,13 +18,7 @@
 import os
 import sys
 
-# We always use rtslib-fb, but until version 2.1.52 it didn't have its own
-# namespace, so we must be backwards compatible.
-try:
-    import rtslib_fb
-except ImportError:
-    import rtslib as rtslib_fb
-
+import rtslib_fb
 
 from cinder import i18n
 from cinder.i18n import _
diff --git a/cinder/tests/unit/test_cmd.py b/cinder/tests/unit/test_cmd.py
index db4c908e919..5c79b17dd37 100644
--- a/cinder/tests/unit/test_cmd.py
+++ b/cinder/tests/unit/test_cmd.py
@@ -29,11 +29,7 @@ if sys.platform == 'darwin':
     rtslib_fb = mock.MagicMock()
     cinder_rtstool = mock.MagicMock()
 else:
-    try:
-        import rtslib_fb
-    except ImportError:
-        import rtslib as rtslib_fb
-
+    import rtslib_fb
 
 from cinder.cmd import api as cinder_api
 from cinder.cmd import backup as cinder_backup
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 21add09f56b..66d0b5d24b7 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -131,7 +131,7 @@ retrying==1.2.3
 rfc3986==1.1.0
 Routes==2.3.1
 rsa==3.4.2
-rtslib-fb==2.1.43
+rtslib-fb==2.1.65
 simplejson==3.5.1
 six==1.10.0
 smmap2==2.0.3
diff --git a/requirements.txt b/requirements.txt
index 923caa5ffc2..5a2df87e340 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -49,7 +49,7 @@ requests>=2.14.2 # Apache-2.0
 retrying!=1.3.0,>=1.2.3 # Apache-2.0
 Routes>=2.3.1 # MIT
 taskflow>=2.16.0 # Apache-2.0
-rtslib-fb!=2.1.60,!=2.1.61,!=2.1.64,>=2.1.43 # Apache-2.0
+rtslib-fb>=2.1.65 # Apache-2.0
 simplejson>=3.5.1 # MIT
 six>=1.10.0 # MIT
 SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT