Fix tempest failures

This commit fixes the gate failures.

Change-Id: I54ec5dbac1d962e67c3c2d874642db9209dfddd5

tests/scenario/congress_datasources/test_glancev2.py

@@ -13,12 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 from oslo_log import log as logging
-from tempest_lib import decorators
-from tempest_lib import exceptions
-
 from tempest import clients  # noqa
 from tempest import config  # noqa
 from tempest import test  # noqa
+from tempest_lib import decorators
+from tempest_lib import exceptions
 
 from congress_tempest_tests.tests.scenario import manager_congress  # noqa
 
@@ -31,8 +30,8 @@ class TestGlanceV2Driver(manager_congress.ScenarioPolicyBase):
     @classmethod
     def check_preconditions(cls):
         super(TestGlanceV2Driver, cls).check_preconditions()
-        if not (CONF.network.tenant_networks_reachable
-                or CONF.network.public_network_id):
+        if not (CONF.network.tenant_networks_reachable or
+                CONF.network.public_network_id):
             msg = ('Either tenant_networks_reachable must be "true", or '
                    'public_network_id must be defined.')
             cls.enabled = False
@@ -43,7 +42,7 @@ class TestGlanceV2Driver(manager_congress.ScenarioPolicyBase):
         if not CONF.service_available.glance:
             skip_msg = ("%s skipped as glance is not available" % cls.__name__)
             raise cls.skipException(skip_msg)
-        cls.os = clients.Manager()
+        cls.os = clients.Manager(cls.admin_manager.auth_provider.credentials)
         cls.glancev2 = cls.os.image_client_v2
         cls.datasource_id = manager_congress.get_datasource_id(
             cls.admin_manager.congress_client, 'glancev2')

tests/scenario/manager_congress.py

@@ -17,14 +17,14 @@ import collections
 import re
 
 from oslo_log import log as logging
-from tempest.common import cred_provider
+from tempest.common import credentials_factory as credentials
 from tempest import config  # noqa
-from tempest import exceptions  # noqa
 from tempest import manager as tempestmanager
 from tempest.scenario import manager  # noqa
 from tempest.services.network import resources as net_resources  # noqa
 from tempest import test  # noqa
 from tempest_lib.common.utils import data_utils
+from tempest_lib import exceptions
 
 from congress_tempest_tests.services.policy import policy_client
 
@@ -49,7 +49,7 @@ class ScenarioPolicyBase(manager.NetworkScenarioTest):
     def setUpClass(cls):
         super(ScenarioPolicyBase, cls).setUpClass()
         # auth provider for admin credentials
-        creds = cred_provider.get_configured_credentials('identity_admin')
+        creds = credentials.get_configured_credentials('identity_admin')
         auth_prov = tempestmanager.get_auth_provider(creds)
 
         cls.admin_manager.congress_client = policy_client.PolicyClient(
@@ -100,7 +100,7 @@ class ScenarioPolicyBase(manager.NetworkScenarioTest):
     def _create_server(self, name, network):
         keypair = self.create_keypair()
         self.keypairs[keypair['name']] = keypair
-        security_groups = [self.security_group]
+        security_groups = [{'name': self.security_group['name']}]
         create_kwargs = {
             'networks': [
                 {'uuid': network.id},