openstack/ironic
Code Issues Proposed changes

Remove service argument from tempest plugin client manager

Browse Source 
It was removed as part of commit
e4be907e34e043888bb10b29655018dd2d4eb06e to tempest.

Also, fix python3 compatibility for API boolean type

This was throwing errors in the latest WSME on python 3.5, make it the
right string type instead. It must be squashed into this change because
each fixes a different CI job, and they can't land without each other.

Closes-Bug: #1654202
Change-Id: I5cefad7d9d8f6db51fd891ecce9879979c83baee
This commit is contained in:
Vladyslav Drok 2017-01-05 12:19:11 +02:00 committed by Jim Rollenhagen
parent 89fa548671
commit 36bd9235a2
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/api/controllers/v1/types.py
View File

@ -117,7 +117,7 @@ class BooleanType(wtypes.UserType):
return strutils.bool_from_string(value, strict=True) return strutils.bool_from_string(value, strict=True)
except ValueError as e: except ValueError as e:
# raise Invalid to return 400 (BadRequest) in the API # raise Invalid to return 400 (BadRequest) in the API
raise exception.Invalid(e) raise exception.Invalid(six.text_type(e))
@staticmethod @staticmethod
def frombasetype(value): def frombasetype(value):

6
ironic_tempest_plugin/clients.py
View File

@ -27,15 +27,13 @@ ADMIN_CREDS = common_creds.get_configured_admin_credentials()
class Manager(clients.Manager): class Manager(clients.Manager):
def __init__(self, def __init__(self,
credentials=ADMIN_CREDS, credentials=ADMIN_CREDS):
service=None):
"""Initialization of Manager class. """Initialization of Manager class.
Setup service client and make it available for test cases. Setup service client and make it available for test cases.
:param credentials: type Credentials or TestResources :param credentials: type Credentials or TestResources
:param service: service name
""" """
super(Manager, self).__init__(credentials, service) super(Manager, self).__init__(credentials)
default_params_with_timeout_values = { default_params_with_timeout_values = {
'build_interval': CONF.compute.build_interval, 'build_interval': CONF.compute.build_interval,
'build_timeout': CONF.compute.build_timeout 'build_timeout': CONF.compute.build_timeout