From 959e0b796eda3a2c1b1c263ebd9d99e872a6bd0f Mon Sep 17 00:00:00 2001
From: Anusha Ramineni <anusha.ramineni@nectechnologies.in>
Date: Mon, 23 Nov 2015 08:55:03 +0530
Subject: [PATCH] Enable keystone, cinder, ceilometer tempest tests

This commit enables the keystone, cinder, ceilometer tempest
tests to run on gate.

Closes-Bug:#1486246
Change-Id: I06f58144cfc1d2455c2faed4f2ca7fa216a59fcd
---
 .../scenario/congress_datasources/test_ceilometer.py   |  2 --
 .../tests/scenario/congress_datasources/test_cinder.py |  4 +---
 .../scenario/congress_datasources/test_keystonev2.py   | 10 +++-------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/congress_tempest_tests/tests/scenario/congress_datasources/test_ceilometer.py b/congress_tempest_tests/tests/scenario/congress_datasources/test_ceilometer.py
index 6d7761b45..175dc1a38 100644
--- a/congress_tempest_tests/tests/scenario/congress_datasources/test_ceilometer.py
+++ b/congress_tempest_tests/tests/scenario/congress_datasources/test_ceilometer.py
@@ -14,7 +14,6 @@
 #    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
@@ -45,7 +44,6 @@ class TestCeilometerDriver(manager_congress.ScenarioPolicyBase):
         cls.datasource_id = manager_congress.get_datasource_id(
             cls.admin_manager.congress_client, 'ceilometer')
 
-    @decorators.skip_because(bug='1486246')
     @test.attr(type='smoke')
     def test_ceilometer_meters_table(self):
         meter_schema = (
diff --git a/congress_tempest_tests/tests/scenario/congress_datasources/test_cinder.py b/congress_tempest_tests/tests/scenario/congress_datasources/test_cinder.py
index 61309912b..f15fd8df3 100644
--- a/congress_tempest_tests/tests/scenario/congress_datasources/test_cinder.py
+++ b/congress_tempest_tests/tests/scenario/congress_datasources/test_cinder.py
@@ -14,7 +14,6 @@
 #    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
@@ -51,7 +50,6 @@ class TestCinderDriver(manager_congress.ScenarioPolicyBase):
         cls.datasource_id = manager_congress.get_datasource_id(
             cls.admin_manager.congress_client, 'cinder')
 
-    @decorators.skip_because(bug='1486246')
     @test.attr(type='smoke')
     def test_cinder_volumes_table(self):
         volume_schema = (
@@ -63,7 +61,7 @@ class TestCinderDriver(manager_congress.ScenarioPolicyBase):
         def _check_data_table_cinder_volumes():
             # Fetch data from cinder each time, because this test may start
             # before cinder has all the users.
-            volumes = self.cinder.list_volumes()
+            volumes = self.cinder.list_volumes()['volumes']
             volumes_map = {}
             for volume in volumes:
                 volumes_map[volume['id']] = volume
diff --git a/congress_tempest_tests/tests/scenario/congress_datasources/test_keystonev2.py b/congress_tempest_tests/tests/scenario/congress_datasources/test_keystonev2.py
index 8afe3bf64..2ff506177 100644
--- a/congress_tempest_tests/tests/scenario/congress_datasources/test_keystonev2.py
+++ b/congress_tempest_tests/tests/scenario/congress_datasources/test_keystonev2.py
@@ -14,7 +14,6 @@
 #    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
@@ -46,7 +45,6 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
         cls.datasource_id = manager_congress.get_datasource_id(
             cls.admin_manager.congress_client, 'keystone')
 
-    @decorators.skip_because(bug='1486246')
     @test.attr(type='smoke')
     def test_keystone_users_table(self):
         user_schema = (
@@ -58,7 +56,7 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
         def _check_data_table_keystone_users():
             # Fetch data from keystone each time, because this test may start
             # before keystone has all the users.
-            users = self.keystone.get_users()
+            users = self.keystone.list_users()['users']
             user_map = {}
             for user in users:
                 user_map[user['id']] = user
@@ -89,7 +87,6 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
             raise exceptions.TimeoutException("Data did not converge in time "
                                               "or failure in server")
 
-    @decorators.skip_because(bug='1486246')
     @test.attr(type='smoke')
     def test_keystone_roles_table(self):
         role_schema = (
@@ -101,7 +98,7 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
         def _check_data_table_keystone_roles():
             # Fetch data from keystone each time, because this test may start
             # before keystone has all the users.
-            roles = self.keystone.list_roles()
+            roles = self.keystone.list_roles()['roles']
             roles_map = {}
             for role in roles:
                 roles_map[role['id']] = role
@@ -125,7 +122,6 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
             raise exceptions.TimeoutException("Data did not converge in time "
                                               "or failure in server")
 
-    @decorators.skip_because(bug='1486246')
     @test.attr(type='smoke')
     def test_keystone_tenants_table(self):
         tenant_schema = (
@@ -137,7 +133,7 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
         def _check_data_table_keystone_tenants():
             # Fetch data from keystone each time, because this test may start
             # before keystone has all the users.
-            tenants = self.keystone.list_tenants()
+            tenants = self.keystone.list_tenants()['tenants']
             tenants_map = {}
             for tenant in tenants:
                 tenants_map[tenant['id']] = tenant