Commit 6784aff8 authored by Christos Stavrakakis's avatar Christos Stavrakakis
Browse files

snf-burnin: Fix wrong merge conflict resolution

Fix wrong merge conflict resolution that caused 'snf-burnin' to crash.
parent a0b3d387
......@@ -516,7 +516,8 @@ class CycladesTests(BurninTests):"Creating a new floating ip for network with id %s",
fip =['id'])
fip =
pub_net['id'], project=project_id)
except ClientError as err:
self.warning("%s: %s", err.message, err.details)
......@@ -524,8 +525,13 @@ class CycladesTests(BurninTests):
fips =
fips = [f['id'] for f in fips]
self.assertIn(fip['id'], fips)
# Verify quotas
if project_id is None:
project_id = self._get_uuid()
changes = \
{project_id: [(QIP, QADD, 1, None)]}
# Check that IP is IPv4
self.assertEquals(IPy.IP(fip['floating_ip_address']).version(), 4)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment