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
This commit is contained in:
parent
e396560f33
commit
f1e942fe8d
@ -18,13 +18,7 @@
|
|||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
# We always use rtslib-fb, but until version 2.1.52 it didn't have its own
|
import rtslib_fb
|
||||||
# namespace, so we must be backwards compatible.
|
|
||||||
try:
|
|
||||||
import rtslib_fb
|
|
||||||
except ImportError:
|
|
||||||
import rtslib as rtslib_fb
|
|
||||||
|
|
||||||
|
|
||||||
from cinder import i18n
|
from cinder import i18n
|
||||||
from cinder.i18n import _
|
from cinder.i18n import _
|
||||||
|
@ -29,11 +29,7 @@ if sys.platform == 'darwin':
|
|||||||
rtslib_fb = mock.MagicMock()
|
rtslib_fb = mock.MagicMock()
|
||||||
cinder_rtstool = mock.MagicMock()
|
cinder_rtstool = mock.MagicMock()
|
||||||
else:
|
else:
|
||||||
try:
|
import rtslib_fb
|
||||||
import rtslib_fb
|
|
||||||
except ImportError:
|
|
||||||
import rtslib as rtslib_fb
|
|
||||||
|
|
||||||
|
|
||||||
from cinder.cmd import api as cinder_api
|
from cinder.cmd import api as cinder_api
|
||||||
from cinder.cmd import backup as cinder_backup
|
from cinder.cmd import backup as cinder_backup
|
||||||
|
@ -131,7 +131,7 @@ retrying==1.2.3
|
|||||||
rfc3986==1.1.0
|
rfc3986==1.1.0
|
||||||
Routes==2.3.1
|
Routes==2.3.1
|
||||||
rsa==3.4.2
|
rsa==3.4.2
|
||||||
rtslib-fb==2.1.43
|
rtslib-fb==2.1.65
|
||||||
simplejson==3.5.1
|
simplejson==3.5.1
|
||||||
six==1.10.0
|
six==1.10.0
|
||||||
smmap2==2.0.3
|
smmap2==2.0.3
|
||||||
|
@ -49,7 +49,7 @@ requests>=2.14.2 # Apache-2.0
|
|||||||
retrying!=1.3.0,>=1.2.3 # Apache-2.0
|
retrying!=1.3.0,>=1.2.3 # Apache-2.0
|
||||||
Routes>=2.3.1 # MIT
|
Routes>=2.3.1 # MIT
|
||||||
taskflow>=2.16.0 # Apache-2.0
|
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
|
simplejson>=3.5.1 # MIT
|
||||||
six>=1.10.0 # MIT
|
six>=1.10.0 # MIT
|
||||||
SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
|
SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
|
||||||
|
Loading…
x
Reference in New Issue
Block a user