Merge "Revert "[TF] Skip check external connectivity (PRODX-5188)"" into mcp/ussuri
diff --git a/neutron_tempest_plugin/api/test_timestamp.py b/neutron_tempest_plugin/api/test_timestamp.py
index c3227a9..0cf28d5 100644
--- a/neutron_tempest_plugin/api/test_timestamp.py
+++ b/neutron_tempest_plugin/api/test_timestamp.py
@@ -305,6 +305,10 @@
updated_security_group = self.client.update_security_group(
security_group['id'], name=security_group['name'] + 'new')[
'security_group']
+ # Workaround for PRODX-7986
+ if CONF.service_available.contrail:
+ updated_security_group = self.client.show_security_group(
+ security_group['id'])['security_group']
# Verify that created_at hasn't changed
self.assertEqual(security_group['created_at'],
diff --git a/neutron_tempest_plugin/scenario/admin/test_floatingip.py b/neutron_tempest_plugin/scenario/admin/test_floatingip.py
index a08acc3..9100b98 100644
--- a/neutron_tempest_plugin/scenario/admin/test_floatingip.py
+++ b/neutron_tempest_plugin/scenario/admin/test_floatingip.py
@@ -62,7 +62,7 @@
servers, fips, server_ssh_clients = ([], [], [])
# Create the availability zone with default zone and
# a specific mentioned hypervisor.
- az = avail_zone + ':' + hyper
+ az = avail_zone + '::' + hyper
for i in range(num_servers):
servers.append(self.create_server(
flavor_ref=CONF.compute.flavor_ref,