Merge "Set the boto ca_certificates_file from tempest config"
diff --git a/tempest/api/identity/admin/v3/test_trusts.py b/tempest/api/identity/admin/v3/test_trusts.py
index 48201ec..e73ad1d 100644
--- a/tempest/api/identity/admin/v3/test_trusts.py
+++ b/tempest/api/identity/admin/v3/test_trusts.py
@@ -119,13 +119,10 @@
summary=False):
self.assertIsNotNone(trust['id'])
self.assertEqual(impersonate, trust['impersonation'])
- # FIXME(shardy): ref bug #1246383 we can't check the
- # microsecond component of the expiry time, because mysql
- # <5.6.4 doesn't support microseconds.
- # expected format 2013-12-20T16:08:36.036987Z
if expires is not None:
- expires_nousec = re.sub(r'\.([0-9]){6}Z', '', expires)
- self.assertTrue(trust['expires_at'].startswith(expires_nousec))
+ # Omit microseconds of the expiry time
+ trust_expires_at = re.sub(r'\.([0-9]){6}', '', trust['expires_at'])
+ self.assertEqual(expires, trust_expires_at)
else:
self.assertIsNone(trust['expires_at'])
self.assertEqual(self.trustor_user_id, trust['trustor_user_id'])
@@ -219,7 +216,13 @@
# Test case to check we can create, get and delete a trust
# with an expiry specified
expires_at = timeutils.utcnow() + datetime.timedelta(hours=1)
- expires_str = timeutils.isotime(at=expires_at, subsecond=True)
+ # NOTE(ylobankov) In some cases the expiry time may be rounded up
+ # because of microseconds. For example, we have the following expiry
+ # time for a trust: 2015-02-17T17:34:01.907051Z. However, if we make
+ # a GET request on the trust, the response may contain the time
+ # rounded up to 2015-02-17T17:34:02.000000Z. That is why we should
+ # omit microseconds when creating a trust.
+ expires_str = timeutils.isotime(at=expires_at)
trust = self.create_trust(expires=expires_str)
self.validate_trust(trust, expires=expires_str)
diff --git a/tempest/api/network/admin/test_floating_ips_admin_actions.py b/tempest/api/network/admin/test_floating_ips_admin_actions.py
index ee3b0bb..e7d4c06 100644
--- a/tempest/api/network/admin/test_floating_ips_admin_actions.py
+++ b/tempest/api/network/admin/test_floating_ips_admin_actions.py
@@ -15,6 +15,7 @@
from tempest.api.network import base
from tempest import clients
+from tempest.common.utils import data_utils
from tempest import config
from tempest import test
@@ -32,6 +33,12 @@
cls.floating_ip = cls.create_floatingip(cls.ext_net_id)
cls.alt_manager = clients.Manager(cls.isolated_creds.get_alt_creds())
cls.alt_client = cls.alt_manager.network_client
+ cls.network = cls.create_network()
+ cls.subnet = cls.create_subnet(cls.network)
+ cls.router = cls.create_router(data_utils.rand_name('router-'),
+ external_network_id=cls.ext_net_id)
+ cls.create_router_interface(cls.router['id'], cls.subnet['id'])
+ cls.port = cls.create_port(cls.network)
@test.attr(type='smoke')
def test_list_floating_ips_from_admin_and_nonadmin(self):
@@ -63,3 +70,39 @@
self.assertNotIn(floating_ip_admin['floatingip']['id'],
floating_ip_ids)
self.assertNotIn(floating_ip_alt['id'], floating_ip_ids)
+
+ @test.attr(type='smoke')
+ def test_create_list_show_floating_ip_with_tenant_id_by_admin(self):
+ # Creates a floating IP
+ body = self.admin_client.create_floatingip(
+ floating_network_id=self.ext_net_id,
+ tenant_id=self.network['tenant_id'],
+ port_id=self.port['id'])
+ created_floating_ip = body['floatingip']
+ self.addCleanup(self.client.delete_floatingip,
+ created_floating_ip['id'])
+ self.assertIsNotNone(created_floating_ip['id'])
+ self.assertIsNotNone(created_floating_ip['tenant_id'])
+ self.assertIsNotNone(created_floating_ip['floating_ip_address'])
+ self.assertEqual(created_floating_ip['port_id'], self.port['id'])
+ self.assertEqual(created_floating_ip['floating_network_id'],
+ self.ext_net_id)
+ port = self.port['fixed_ips']
+ self.assertEqual(created_floating_ip['fixed_ip_address'],
+ port[0]['ip_address'])
+ # Verifies the details of a floating_ip
+ floating_ip = self.admin_client.show_floatingip(
+ created_floating_ip['id'])
+ shown_floating_ip = floating_ip['floatingip']
+ self.assertEqual(shown_floating_ip['id'], created_floating_ip['id'])
+ self.assertEqual(shown_floating_ip['floating_network_id'],
+ self.ext_net_id)
+ self.assertEqual(shown_floating_ip['tenant_id'],
+ self.network['tenant_id'])
+ self.assertEqual(shown_floating_ip['floating_ip_address'],
+ created_floating_ip['floating_ip_address'])
+ self.assertEqual(shown_floating_ip['port_id'], self.port['id'])
+ # Verify the floating ip exists in the list of all floating_ips
+ floating_ips = self.admin_client.list_floatingips()
+ floatingip_id_list = [f['id'] for f in floating_ips['floatingips']]
+ self.assertIn(created_floating_ip['id'], floatingip_id_list)
diff --git a/tempest/scenario/test_swift_telemetry_middleware.py b/tempest/scenario/test_swift_telemetry_middleware.py
index dce6023..dd6d855 100644
--- a/tempest/scenario/test_swift_telemetry_middleware.py
+++ b/tempest/scenario/test_swift_telemetry_middleware.py
@@ -76,19 +76,22 @@
LOG.debug('got samples %s', results)
# Extract container info from samples.
- containers = [sample['resource_metadata']['container']
- for sample in results
- if sample['resource_metadata']['container']
- != 'None']
- # Extract object info from samples.
- objects = [sample['resource_metadata']['object']
- for sample in results
- if sample['resource_metadata']['object'] != 'None']
+ containers, objects = [], []
+ for sample in results:
+ meta = sample['resource_metadata']
+ if meta.get('container') and meta['container'] != 'None':
+ containers.append(meta['container'])
+ elif (meta.get('target') and
+ meta['target']['metadata']['container'] != 'None'):
+ containers.append(meta['target']['metadata']['container'])
- return (containers
- and objects
- and container_name in containers
- and obj_name in objects)
+ if meta.get('object') and meta['object'] != 'None':
+ objects.append(meta['object'])
+ elif (meta.get('target') and
+ meta['target']['metadata']['object'] != 'None'):
+ objects.append(meta['target']['metadata']['object'])
+
+ return (container_name in containers and obj_name in objects)
self.assertTrue(test.call_until_true(_check_samples,
NOTIFICATIONS_WAIT,