Fix issues with Python3
Partially implements: blueprint python-3 Change-Id: Iac7a61026e83dfa977de7edb2cf141c285603e2b
This commit is contained in:
parent
5e14c75392
commit
f2748d36aa
|
@ -13,8 +13,7 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import json
|
||||
|
||||
from oslo_serialization import jsonutils as json
|
||||
from tempest.lib.common import rest_client
|
||||
|
||||
|
||||
|
@ -41,12 +40,12 @@ class ResourceReservationV1Client(rest_client.RestClient):
|
|||
return self._response_helper(resp, body)
|
||||
|
||||
def create_lease(self, body):
|
||||
body = json.dumps(body)
|
||||
body = json.dump_as_bytes(body)
|
||||
resp, body = self.post(self.lease, body=body)
|
||||
return self._response_helper(resp, body)
|
||||
|
||||
def update_lease(self, lease, body):
|
||||
body = json.dumps(body)
|
||||
body = json.dump_as_bytes(body)
|
||||
resp, body = self.put(self.lease_path % lease, body=body)
|
||||
return self._response_helper(resp, body)
|
||||
|
||||
|
@ -63,12 +62,12 @@ class ResourceReservationV1Client(rest_client.RestClient):
|
|||
return self._response_helper(resp, body)
|
||||
|
||||
def create_host(self, body):
|
||||
body = json.dumps(body)
|
||||
body = json.dump_as_bytes(body)
|
||||
resp, body = self.post(self.host, body=body)
|
||||
return self._response_helper(resp, body)
|
||||
|
||||
def update_host(self, host, body):
|
||||
body = json.dumps(body)
|
||||
body = json.dump_as_bytes(body)
|
||||
resp, body = self.put(self.host_path % host, body=body)
|
||||
return self._response_helper(resp, body)
|
||||
|
||||
|
|
|
@ -58,8 +58,8 @@ class ResourceReservationScenarioTest(manager.ScenarioTest):
|
|||
named_lease = []
|
||||
|
||||
# and then search by lease_name
|
||||
named_lease = (
|
||||
filter(lambda lease: lease['name'] == lease_name, lease_list))
|
||||
named_lease = [lease for lease in lease_list
|
||||
if lease['name'] == lease_name]
|
||||
|
||||
if named_lease:
|
||||
return self.reservation_client.get_lease(
|
||||
|
@ -78,16 +78,15 @@ class ResourceReservationScenarioTest(manager.ScenarioTest):
|
|||
lease = self.reservation_client.get_lease(lease_id)['lease']
|
||||
if lease:
|
||||
events = lease['events']
|
||||
return len(filter(lambda evt:
|
||||
evt['event_type'] == 'end_lease' and
|
||||
evt['status'] == 'DONE',
|
||||
events)) > 0
|
||||
return len([evt for evt in events
|
||||
if evt['event_type'] == 'end_lease'
|
||||
and evt['status'] == 'DONE']) > 0
|
||||
else:
|
||||
LOG.info("Lease with id %s is empty", lease_id)
|
||||
except Exception as e:
|
||||
LOG.info("Unable to find lease with id %(lease_id)s. "
|
||||
"Exception: %(message)s",
|
||||
{'lease_id': lease_id, 'message': e.message})
|
||||
{'lease_id': lease_id, 'message': str(e)})
|
||||
return True
|
||||
|
||||
if not test_utils.call_until_true(
|
||||
|
@ -99,14 +98,13 @@ class ResourceReservationScenarioTest(manager.ScenarioTest):
|
|||
|
||||
def remove_image_snapshot(self, image_name):
|
||||
try:
|
||||
image = filter(lambda i:
|
||||
i['name'] == image_name,
|
||||
self.image_client.list())
|
||||
image = [i for i in self.image_client.list()
|
||||
if ['name'] == image_name]
|
||||
self.image_client.delete(image)
|
||||
except Exception as e:
|
||||
LOG.info("Unable to delete %(image_name)s snapshot. "
|
||||
"Exception: %(message)s",
|
||||
{'image_name': image_name, 'message': e.message})
|
||||
{'image_name': image_name, 'message': str(e)})
|
||||
|
||||
def is_flavor_enough(self, flavor_id, image_id):
|
||||
image = self.compute_images_client.show_image(image_id)['image']
|
||||
|
|
|
@ -139,9 +139,8 @@ class TestHostReservationScenario(rrs.ResourceReservationScenarioTest):
|
|||
def fetch_aggregate_by_name(self, name):
|
||||
aggregates = self.aggr_client.list_aggregates()['aggregates']
|
||||
try:
|
||||
aggr = next(iter(filter(lambda aggr: aggr['name'] == name,
|
||||
aggregates)))
|
||||
except StopIteration:
|
||||
aggr = [aggr for aggr in aggregates if aggr['name'] == name][0]
|
||||
except IndexError:
|
||||
err_msg = "aggregate with name %s doesn't exist." % name
|
||||
raise exceptions.NotFound(err_msg)
|
||||
return aggr
|
||||
|
@ -163,9 +162,8 @@ class TestHostReservationScenario(rrs.ResourceReservationScenarioTest):
|
|||
host = self.fetch_one_compute_host()
|
||||
hosts = self.reservation_client.list_host()['hosts']
|
||||
try:
|
||||
next(iter(filter(
|
||||
lambda h: h['hypervisor_hostname'] == host['host'], hosts)))
|
||||
except StopIteration:
|
||||
[h for h in hosts if h['hypervisor_hostname'] == host['host']][0]
|
||||
except IndexError:
|
||||
self.reservation_client.create_host({'name': host['host']})
|
||||
return host
|
||||
|
||||
|
|
|
@ -14,10 +14,10 @@
|
|||
# under the License.
|
||||
|
||||
import datetime
|
||||
import json
|
||||
|
||||
import dateutil.parser
|
||||
from oslo_log import log as logging
|
||||
from oslo_serialization import jsonutils as json
|
||||
from tempest.common import waiters
|
||||
from tempest import config
|
||||
from tempest import exceptions
|
||||
|
@ -111,10 +111,9 @@ class TestInstanceReservationScenario(rrs.ResourceReservationScenarioTest):
|
|||
self.assertTrue(len(events) >= 3)
|
||||
|
||||
self.assertFalse(
|
||||
len(filter(lambda evt: evt['event_type'] != 'start_lease' and
|
||||
evt['event_type'] != 'end_lease' and
|
||||
evt['event_type'] != 'before_end_lease',
|
||||
events)) > 0)
|
||||
len([evt for evt in events if evt['event_type'] != 'start_lease'
|
||||
and evt['event_type'] != 'end_lease'
|
||||
and evt['event_type'] != 'before_end_lease']) > 0)
|
||||
|
||||
# check that only one reservation was made and it is for a vm
|
||||
# compare the resource id from the lease with the server.id attribute!
|
||||
|
@ -129,10 +128,10 @@ class TestInstanceReservationScenario(rrs.ResourceReservationScenarioTest):
|
|||
try:
|
||||
images_list = self.image_client.list()
|
||||
self.assertNotEmpty(
|
||||
filter(lambda image: image.name == image_name, images_list))
|
||||
[image for image in images_list if image.name == image_name])
|
||||
except Exception as e:
|
||||
message = ("Unable to find image with name '%s'. "
|
||||
"Exception: %s" % (image_name, e.message))
|
||||
"Exception: %s" % (image_name, str(e)))
|
||||
raise exceptions.NotFound(message)
|
||||
|
||||
def check_server_status(self, expected_status):
|
||||
|
|
Loading…
Reference in New Issue