1 files changed, 7 insertions, 5 deletions
diff --git a/tests/functional/common/provisioning/test_dynamic_provisioning_block_p0_cases.py b/tests/functional/common/provisioning/test_dynamic_provisioning_block_p0_cases.py
index ecd47176..81fec14e 100644
--- a/tests/functional/common/provisioning/test_dynamic_provisioning_block_p0_cases.py
+++ b/tests/functional/common/provisioning/test_dynamic_provisioning_block_p0_cases.py
@@ -37,16 +37,18 @@ class TestDynamicProvisioningBlockP0(CnsGlusterBlockBaseClass):
     def setUp(self):
         super(TestDynamicProvisioningBlockP0, self).setUp()
         self.node = self.ocp_master_node[0]
-        self.sc = self.cns_storage_class['storage_class2']
+        self.sc = self.cns_storage_class.get(
+            'storage_class2',
+            self.cns_storage_class.get('block_storage_class'))
 
     def _create_storage_class(self, hacount=True, create_name_prefix=False,
                               reclaim_policy="Delete"):
-        secret = self.cns_secret['secret2']
-
         # Create secret file
         self.secret_name = oc_create_secret(
-            self.node, namespace=secret['namespace'],
-            data_key=self.heketi_cli_key, secret_type=secret['type'])
+            self.node,
+            namespace=self.sc.get('restsecretnamespace', 'default'),
+            data_key=self.heketi_cli_key,
+            secret_type=self.sc.get('provisioner', 'gluster.org/glusterblock'))
         self.addCleanup(oc_delete, self.node, 'secret', self.secret_name)
 
         # create storage class