openstack
/
rally-openstack
Code Issues Proposed changes

Merge "Wrap several actions in VMTask with atomic timer"

This commit is contained in:
Jenkins 2017-10-04 01:17:20 +00:00 committed by Gerrit Code Review
parent d3c2d53419 7ffa1b95c5
commit dbbc95443b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rally/plugins/openstack/scenarios/vm/utils.py
View File

@ -166,9 +166,10 @@ class VMScenario(nova_utils.NovaScenario):
internal_network = list(server.networks)[0]
fixed_ip = server.addresses[internal_network][0]["addr"]
fip = network_wrapper.wrap(self.clients, self).create_floating_ip(
ext_network=floating_network,
tenant_id=server.tenant_id, fixed_ip=fixed_ip)
with atomic.ActionTimer(self, "neutron.create_floating_ip"):
fip = network_wrapper.wrap(self.clients, self).create_floating_ip(
ext_network=floating_network,
tenant_id=server.tenant_id, fixed_ip=fixed_ip)
self._associate_floating_ip(server, fip["ip"], fixed_address=fixed_ip)
@ -180,8 +181,10 @@ class VMScenario(nova_utils.NovaScenario):
LOG, _("Unable to delete IP: %s") % fip["ip"]):
if self.check_ip_address(fip["ip"])(server):
self._dissociate_floating_ip(server, fip["ip"])
network_wrapper.wrap(self.clients, self).delete_floating_ip(
fip["id"], wait=True)
with atomic.ActionTimer(self, "neutron.delete_floating_ip"):
network_wrapper.wrap(self.clients,
self).delete_floating_ip(
fip["id"], wait=True)
def _delete_server_with_fip(self, server, fip, force_delete=False):
if fip["is_floating"]: