Fixed confusing cls param in instance methods

Replaced with self as is conventional.

Change-Id: I0f6aed2d820e70833d7f7a3e98c3c0bd08b17956

tests/scenario/congress_datasources/_test_keystonev2.py

@@ -36,16 +36,16 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
             cls.enabled = False
             raise cls.skipException(msg)
 
-    def setUp(cls):
-        super(TestKeystoneV2Driver, cls).setUp()
-        cls.os_primary = clients.Manager(
-            cls.os_admin.auth_provider.credentials)
-        cls.keystone = cls.os_primary.identity_client
-        cls.tenants_client = cls.os_primary.tenants_client
-        cls.roles_client = cls.os_primary.roles_client
-        cls.users_client = cls.os_primary.users_client
-        cls.datasource_id = manager_congress.get_datasource_id(
-            cls.os_admin.congress_client, 'keystone')
+    def setUp(self):
+        super(TestKeystoneV2Driver, self).setUp()
+        self.os_primary = clients.Manager(
+            self.os_admin.auth_provider.credentials)
+        self.keystone = self.os_primary.identity_client
+        self.tenants_client = self.os_primary.tenants_client
+        self.roles_client = self.os_primary.roles_client
+        self.users_client = self.os_primary.users_client
+        self.datasource_id = manager_congress.get_datasource_id(
+            self.os_admin.congress_client, 'keystone')
 
     @decorators.attr(type='smoke')
     def test_keystone_users_table(self):

tests/scenario/congress_datasources/test_aodh.py

@@ -34,11 +34,11 @@ class TestAodhDriver(manager_congress.ScenarioPolicyBase):
                    cls.__class__.__name__)
             raise cls.skipException(msg)
 
-    def setUp(cls):
-        super(TestAodhDriver, cls).setUp()
-        cls.alarms_client = cls.os_admin.alarms_client
-        cls.datasource_id = manager_congress.get_datasource_id(
-            cls.os_admin.congress_client, 'aodh')
+    def setUp(self):
+        super(TestAodhDriver, self).setUp()
+        self.alarms_client = self.os_admin.alarms_client
+        self.datasource_id = manager_congress.get_datasource_id(
+            self.os_admin.congress_client, 'aodh')
 
     @decorators.attr(type='smoke')
     def test_aodh_alarms_table(self):

tests/scenario/congress_datasources/test_ceilometer.py

@@ -34,11 +34,11 @@ class TestCeilometerDriver(manager_congress.ScenarioPolicyBase):
                    cls.__class__.__name__)
             raise cls.skipException(msg)
 
-    def setUp(cls):
-        super(TestCeilometerDriver, cls).setUp()
-        cls.telemetry_client = cls.os_admin.telemetry_client
-        cls.datasource_id = manager_congress.get_datasource_id(
-            cls.os_admin.congress_client, 'ceilometer')
+    def setUp(self):
+        super(TestCeilometerDriver, self).setUp()
+        self.telemetry_client = self.os_admin.telemetry_client
+        self.datasource_id = manager_congress.get_datasource_id(
+            self.os_admin.congress_client, 'ceilometer')
 
     @decorators.attr(type='smoke')
     def test_ceilometer_meters_table(self):

tests/scenario/congress_datasources/test_cinder.py

@@ -43,15 +43,15 @@ class TestCinderDriver(manager_congress.ScenarioPolicyBase):
             skip_msg = ("%s skipped as cinder is not available" % cls.__name__)
             raise cls.skipException(skip_msg)
 
-    def setUp(cls):
-        super(TestCinderDriver, cls).setUp()
-        cls.os_primary = clients.Manager(
-            cls.os_admin.auth_provider.credentials)
-        cls.cinder = cls.os_primary.volumes_v2_client
-        cls.datasource_id = manager_congress.get_datasource_id(
-            cls.os_admin.congress_client, 'cinder')
-        res = cls.cinder.create_volume(size=1, description=None, name='v0',
-                                       consistencygroup_id=None, metadata={})
+    def setUp(self):
+        super(TestCinderDriver, self).setUp()
+        self.os_primary = clients.Manager(
+            self.os_admin.auth_provider.credentials)
+        self.cinder = self.os_primary.volumes_v2_client
+        self.datasource_id = manager_congress.get_datasource_id(
+            self.os_admin.congress_client, 'cinder')
+        res = self.cinder.create_volume(size=1, description=None, name='v0',
+                                        consistencygroup_id=None, metadata={})
         LOG.debug('result of creating new volume: %s', res)
 
     @decorators.attr(type='smoke')

tests/scenario/congress_datasources/test_glancev2.py

@@ -41,13 +41,13 @@ class TestGlanceV2Driver(manager_congress.ScenarioPolicyBase):
             skip_msg = ("%s skipped as glance is not available" % cls.__name__)
             raise cls.skipException(skip_msg)
 
-    def setUp(cls):
-        super(TestGlanceV2Driver, cls).setUp()
-        cls.os_primary = clients.Manager(
-            cls.os_admin.auth_provider.credentials)
-        cls.glancev2 = cls.os_primary.image_client_v2
-        cls.datasource_id = manager_congress.get_datasource_id(
-            cls.os_admin.congress_client, 'glancev2')
+    def setUp(self):
+        super(TestGlanceV2Driver, self).setUp()
+        self.os_primary = clients.Manager(
+            self.os_admin.auth_provider.credentials)
+        self.glancev2 = self.os_primary.image_client_v2
+        self.datasource_id = manager_congress.get_datasource_id(
+            self.os_admin.congress_client, 'glancev2')
 
     @decorators.attr(type='smoke')
     @test.services('image')

tests/scenario/congress_datasources/test_keystonev3.py

@@ -36,17 +36,17 @@ class TestKeystoneV3Driver(manager_congress.ScenarioPolicyBase):
             cls.enabled = False
             raise cls.skipException(msg)
 
-    def setUp(cls):
-        super(TestKeystoneV3Driver, cls).setUp()
-        cls.os_primary = clients.Manager(
-            cls.os_admin.auth_provider.credentials)
-        cls.keystone = cls.os_primary.identity_v3_client
-        cls.projects_client = cls.os_primary.projects_client
-        cls.domains_client = cls.os_primary.domains_client
-        cls.roles_client = cls.os_primary.roles_v3_client
-        cls.users_client = cls.os_primary.users_v3_client
-        cls.datasource_id = manager_congress.get_datasource_id(
-            cls.os_admin.congress_client, 'keystonev3')
+    def setUp(self):
+        super(TestKeystoneV3Driver, self).setUp()
+        self.os_primary = clients.Manager(
+            self.os_admin.auth_provider.credentials)
+        self.keystone = self.os_primary.identity_v3_client
+        self.projects_client = self.os_primary.projects_client
+        self.domains_client = self.os_primary.domains_client
+        self.roles_client = self.os_primary.roles_v3_client
+        self.users_client = self.os_primary.users_v3_client
+        self.datasource_id = manager_congress.get_datasource_id(
+            self.os_admin.congress_client, 'keystonev3')
 
     @decorators.attr(type='smoke')
     def test_keystone_users_table(self):

tests/scenario/congress_datasources/test_neutronv2.py

@@ -44,17 +44,17 @@ class TestNeutronV2Driver(manager_congress.ScenarioPolicyBase):
                         % cls.__name__)
             raise cls.skipException(skip_msg)
 
-    def setUp(cls):
-        super(TestNeutronV2Driver, cls).setUp()
-        cls.os_primary = clients.Manager(
-            cls.os_admin.auth_provider.credentials)
-        cls.networks_client = cls.os_primary.networks_client
-        cls.subnets_client = cls.os_primary.subnets_client
-        cls.ports_client = cls.os_primary.ports_client
-        cls.security_groups_client = cls.os_primary.security_groups_client
-        cls.routers_client = cls.os_primary.routers_client
-        cls.datasource_id = manager_congress.get_datasource_id(
-            cls.os_admin.congress_client, 'neutronv2')
+    def setUp(self):
+        super(TestNeutronV2Driver, self).setUp()
+        self.os_primary = clients.Manager(
+            self.os_admin.auth_provider.credentials)
+        self.networks_client = self.os_primary.networks_client
+        self.subnets_client = self.os_primary.subnets_client
+        self.ports_client = self.os_primary.ports_client
+        self.security_groups_client = self.os_primary.security_groups_client
+        self.routers_client = self.os_primary.routers_client
+        self.datasource_id = manager_congress.get_datasource_id(
+            self.os_admin.congress_client, 'neutronv2')
 
     @decorators.attr(type='smoke')
     @test.services('network')