openstack
/
zun
Code Issues Proposed changes

Remove the usage of WSME library 

WSME is deprecated [1]. This patch removes its usage in code and
also remove it from requirements/lower-contraints.

[1] http://lists.openstack.org/pipermail/openstack-dev/2018-April/129206.html

Change-Id: I74c6b76d71d5dc05825a1a6f69bf2c09e84dee51
This commit is contained in:
Hongbin Lu 2018-04-20 02:14:59 +00:00
parent 16340886db
commit b80327416b
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lower-constraints.txt
View File

@ -163,4 +163,3 @@ websocket-client==0.44.0
websockify==0.8.0
WebTest==2.0.29
wrapt==1.10.11
WSME==0.8.0

1
requirements.txt
View File

@ -29,7 +29,6 @@ oslo.db>=4.27.0 # Apache-2.0
os-vif!=1.8.0,>=1.7.0 # Apache-2.0
os-brick>=2.2.0 # Apache-2.0
six>=1.10.0 # MIT
WSME>=0.8.0 # MIT
SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
stevedore>=1.20.0 # Apache-2.0
docker>=2.4.2 # Apache-2.0

11
zun/api/utils.py
View File

@ -15,7 +15,6 @@
from oslo_utils import uuidutils
import pecan
import wsme
from zun.api.controllers import versions
from zun.common import exception
@ -39,9 +38,9 @@ def string_or_none(value):
def validate_limit(limit):
try:
if limit is not None and int(limit) <= 0:
raise wsme.exc.ClientSideError(_("Limit must be positive integer"))
raise exception.InvalidValue(_("Limit must be positive integer"))
except ValueError:
raise wsme.exc.ClientSideError(_("Limit must be positive integer"))
raise exception.InvalidValue(_("Limit must be positive integer"))
if limit is not None:
return min(CONF.api.max_limit, int(limit))
@ -51,9 +50,9 @@ def validate_limit(limit):
def validate_sort_dir(sort_dir):
if sort_dir not in ['asc', 'desc']:
raise wsme.exc.ClientSideError(_("Invalid sort direction: %s. "
"Acceptable values are "
"'asc' or 'desc'") % sort_dir)
raise exception.InvalidValue(_("Invalid sort direction: %s. "
"Acceptable values are "
"'asc' or 'desc'") % sort_dir)
return sort_dir

14
zun/tests/unit/api/test_utils.py
View File

@ -9,9 +9,9 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import wsme
from zun.api import utils
from zun.common import exception
from zun.tests import base
@ -22,25 +22,25 @@ class TestUtils(base.BaseTestCase):
self.assertEqual(1000, utils.validate_limit(None))
self.assertEqual(1000, utils.validate_limit(1001))
self.assertEqual(50, utils.validate_limit(50))
with self.assertRaisesRegex(wsme.exc.ClientSideError,
with self.assertRaisesRegex(exception.InvalidValue,
"Limit must be positive"):
utils.validate_limit(-1)
with self.assertRaisesRegex(wsme.exc.ClientSideError,
with self.assertRaisesRegex(exception.InvalidValue,
"Limit must be positive"):
utils.validate_limit(0)
with self.assertRaisesRegex(wsme.exc.ClientSideError,
with self.assertRaisesRegex(exception.InvalidValue,
"Limit must be positive integer"):
utils.validate_limit('a')
with self.assertRaisesRegex(wsme.exc.ClientSideError,
with self.assertRaisesRegex(exception.InvalidValue,
"Limit must be positive integer"):
utils.validate_limit('5.5')
def test_validate_sort_dir(self):
self.assertEqual('asc', utils.validate_sort_dir('asc'))
self.assertEqual('desc', utils.validate_sort_dir('desc'))
with self.assertRaisesRegex(wsme.exc.ClientSideError,
with self.assertRaisesRegex(exception.InvalidValue,
"Invalid sort direction"):
utils.validate_sort_dir(None)
with self.assertRaisesRegex(wsme.exc.ClientSideError,
with self.assertRaisesRegex(exception.InvalidValue,
"Invalid sort direction"):
utils.validate_sort_dir('abc')