diff options
Diffstat (limited to 'tests/functional')
3 files changed, 37 insertions, 37 deletions
diff --git a/tests/functional/common/heketi/test_volume_multi_req.py b/tests/functional/common/heketi/test_volume_multi_req.py index 825fd9dc..0a33f2a7 100644 --- a/tests/functional/common/heketi/test_volume_multi_req.py +++ b/tests/functional/common/heketi/test_volume_multi_req.py @@ -5,7 +5,7 @@ import contextlib import random import threading import time -import unitest +import unittest import ddt import yaml 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 933033ae..8db0b01d 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 @@ -28,12 +28,13 @@ class TestDynamicProvisioningBlockP0(CnsGlusterBlockBaseClass): def test_dynamic_provisioning_glusterblock(self): g.log.info("test_dynamic_provisioning_glusterblock") storage_class = self.cns_storage_class['storage_class2'] - cmd = ("oc get svc | grep heketi | grep -v endpoints " - "| awk '{print $2}'") + secret = self.cns_secret['secret2'] + cmd = ("oc get svc %s " + "-o=custom-columns=:.spec.clusterIP" % self.heketi_service_name) ret, out, err = g.run(self.ocp_master_node[0], cmd, "root") self.assertEqual(ret, 0, "failed to execute command %s on %s" % ( cmd, self.ocp_master_node[0])) - heketi_cluster_ip = out.strip().split("\n")[0] + heketi_cluster_ip = out.lstrip().strip() resturl_block = "http://%s:8080" % heketi_cluster_ip if not export_heketi_cli_server( self.heketi_client_node, @@ -57,7 +58,7 @@ class TestDynamicProvisioningBlockP0(CnsGlusterBlockBaseClass): storage_class['provisioner'], restuser=storage_class['restuser'], restsecretnamespace=storage_class['restsecretnamespace'], - restsecretname=storage_class['restsecretname'], + restsecretname=secret['secret_name'], hacount=storage_class['hacount'], clusterids=cluster_id) self.assertTrue(ret, "creation of storage-class file failed") @@ -67,7 +68,6 @@ class TestDynamicProvisioningBlockP0(CnsGlusterBlockBaseClass): oc_create(self.ocp_master_node[0], file_path) self.addCleanup(oc_delete, self.ocp_master_node[0], 'sc', sc_name) - secret = self.cns_secret['secret2'] ret = create_secret_file(self.ocp_master_node[0], secret['secret_name'], secret['namespace'], @@ -139,12 +139,13 @@ class TestDynamicProvisioningBlockP0(CnsGlusterBlockBaseClass): def test_dynamic_provisioning_glusterblock_heketipod_failure(self): g.log.info("test_dynamic_provisioning_glusterblock_Heketipod_Failure") storage_class = self.cns_storage_class['storage_class2'] - cmd = ("oc get svc | grep heketi | grep -v endpoints " - "| awk '{print $2}'") + secret = self.cns_secret['secret2'] + cmd = ("oc get svc %s " + "-o=custom-columns=:.spec.clusterIP" % self.heketi_service_name) ret, out, err = g.run(self.ocp_master_node[0], cmd, "root") self.assertEqual(ret, 0, "failed to execute command %s on %s" % ( cmd, self.ocp_master_node[0])) - heketi_cluster_ip = out.strip().split("\n")[0] + heketi_cluster_ip = out.lstrip().strip() resturl_block = "http://%s:8080" % heketi_cluster_ip if not export_heketi_cli_server( self.heketi_client_node, @@ -168,7 +169,7 @@ class TestDynamicProvisioningBlockP0(CnsGlusterBlockBaseClass): storage_class['provisioner'], restuser=storage_class['restuser'], restsecretnamespace=storage_class['restsecretnamespace'], - restsecretname=storage_class['restsecretname'], + restsecretname=secret['secret_name'], hacount=storage_class['hacount'], clusterids=cluster_id) self.assertTrue(ret, "creation of storage-class file failed") @@ -178,7 +179,6 @@ class TestDynamicProvisioningBlockP0(CnsGlusterBlockBaseClass): oc_create(self.ocp_master_node[0], file_path) self.addCleanup(oc_delete, self.ocp_master_node[0], 'sc', sc_name) - secret = self.cns_secret['secret2'] ret = create_secret_file(self.ocp_master_node[0], secret['secret_name'], secret['namespace'], @@ -236,12 +236,12 @@ class TestDynamicProvisioningBlockP0(CnsGlusterBlockBaseClass): cmd, self.ocp_master_node[0])) ret = verify_pod_status_running(self.ocp_master_node[0], "heketi") self.assertTrue(ret, "verify heketi pod status as running failed") - cmd = ("oc get svc | grep heketi | grep -v endpoints " - "| awk '{print $2}'") + cmd = ("oc get svc %s " + "-o=custom-columns=:.spec.clusterIP" % self.heketi_service_name) ret, out, err = g.run(self.ocp_master_node[0], cmd, "root") self.assertEqual(ret, 0, "failed to execute command %s on %s" % ( cmd, self.ocp_master_node[0])) - heketi_cluster_new_ip = out.strip().split("\n")[0] + heketi_cluster_new_ip = out.lstrip().strip() if heketi_cluster_new_ip != heketi_cluster_ip: oc_delete(self.ocp_master_node[0], 'sc', sc_name) resturl_block = "http://%s:8080" % heketi_cluster_new_ip @@ -296,12 +296,13 @@ class TestDynamicProvisioningBlockP0(CnsGlusterBlockBaseClass): def test_dynamic_provisioning_glusterblock_glusterpod_failure(self): g.log.info("test_dynamic_provisioning_glusterblock_Glusterpod_Failure") storage_class = self.cns_storage_class['storage_class2'] - cmd = ("oc get svc | grep heketi | grep -v endpoints " - "| awk '{print $2}'") + secret = self.cns_secret['secret2'] + cmd = ("oc get svc %s " + "-o=custom-columns=:.spec.clusterIP" % self.heketi_service_name) ret, out, err = g.run(self.ocp_master_node[0], cmd, "root") self.assertEqual(ret, 0, "failed to execute command %s on %s" % ( cmd, self.ocp_master_node[0])) - heketi_cluster_ip = out.strip().split("\n")[0] + heketi_cluster_ip = out.lstrip().strip() resturl_block = "http://%s:8080" % heketi_cluster_ip if not export_heketi_cli_server( self.heketi_client_node, @@ -325,7 +326,7 @@ class TestDynamicProvisioningBlockP0(CnsGlusterBlockBaseClass): storage_class['provisioner'], restuser=storage_class['restuser'], restsecretnamespace=storage_class['restsecretnamespace'], - restsecretname=storage_class['restsecretname'], + restsecretname=secret['secret_name'], hacount=storage_class['hacount'], clusterids=cluster_id) self.assertTrue(ret, "creation of storage-class file failed") @@ -335,7 +336,6 @@ class TestDynamicProvisioningBlockP0(CnsGlusterBlockBaseClass): oc_create(self.ocp_master_node[0], file_path) self.addCleanup(oc_delete, self.ocp_master_node[0], 'sc', sc_name) - secret = self.cns_secret['secret2'] ret = create_secret_file(self.ocp_master_node[0], secret['secret_name'], secret['namespace'], diff --git a/tests/functional/common/provisioning/test_dynamic_provisioning_p0_cases.py b/tests/functional/common/provisioning/test_dynamic_provisioning_p0_cases.py index 0167573f..734cc8a5 100644 --- a/tests/functional/common/provisioning/test_dynamic_provisioning_p0_cases.py +++ b/tests/functional/common/provisioning/test_dynamic_provisioning_p0_cases.py @@ -28,14 +28,15 @@ class TestDynamicProvisioningP0(CnsBaseClass): def test_dynamic_provisioning_glusterfile(self): g.log.info("test_dynamic_provisioning_glusterfile") storage_class = self.cns_storage_class['storage_class1'] + secret = self.cns_secret['secret1'] sc_name = storage_class['name'] pvc_name1 = "mongodb1" - cmd = ("oc get svc | grep heketi | grep -v endpoints " - "| awk '{print $2}'") + cmd = ("oc get svc %s " + "-o=custom-columns=:.spec.clusterIP" % self.heketi_service_name) ret, out, err = g.run(self.ocp_master_node[0], cmd, "root") self.assertEqual(ret, 0, "failed to execute command %s on %s" % ( cmd, self.ocp_master_node[0])) - heketi_cluster_ip = out.strip().split("\n")[0] + heketi_cluster_ip = out.lstrip().strip() resturl = "http://%s:8080" % heketi_cluster_ip ret = create_storage_class_file( self.ocp_master_node[0], @@ -44,7 +45,7 @@ class TestDynamicProvisioningP0(CnsBaseClass): storage_class['provisioner'], restuser=storage_class['restuser'], secretnamespace=storage_class['secretnamespace'], - secretname=storage_class['secretname']) + secretname=secret['secret_name']) self.assertTrue(ret, "creation of storage-class file failed") provisioner_name = storage_class['provisioner'].split("/") file_path = "/%s-%s-storage-class.yaml" % ( @@ -52,7 +53,6 @@ class TestDynamicProvisioningP0(CnsBaseClass): oc_create(self.ocp_master_node[0], file_path) self.addCleanup(oc_delete, self.ocp_master_node[0], 'sc', sc_name) - secret = self.cns_secret['secret1'] ret = create_secret_file(self.ocp_master_node[0], secret['secret_name'], secret['namespace'], @@ -109,14 +109,15 @@ class TestDynamicProvisioningP0(CnsBaseClass): def test_dynamic_provisioning_glusterfile_heketipod_failure(self): g.log.info("test_dynamic_provisioning_glusterfile_Heketipod_Failure") storage_class = self.cns_storage_class['storage_class1'] + secret = self.cns_secret['secret1'] sc_name = storage_class['name'] pvc_name2 = "mongodb2" - cmd = ("oc get svc | grep heketi | grep -v endpoints " - "| awk '{print $2}'") + cmd = ("oc get svc %s " + "-o=custom-columns=:.spec.clusterIP" % self.heketi_service_name) ret, out, err = g.run(self.ocp_master_node[0], cmd, "root") self.assertEqual(ret, 0, "failed to execute command %s on %s" % ( cmd, self.ocp_master_node[0])) - heketi_cluster_ip = out.strip().split("\n")[0] + heketi_cluster_ip = out.lstrip().strip() resturl = "http://%s:8080" % heketi_cluster_ip ret = create_storage_class_file( self.ocp_master_node[0], @@ -125,7 +126,7 @@ class TestDynamicProvisioningP0(CnsBaseClass): storage_class['provisioner'], restuser=storage_class['restuser'], secretnamespace=storage_class['secretnamespace'], - secretname=storage_class['secretname']) + secretname=secret['secret_name']) self.assertTrue(ret, "creation of storage-class file failed") provisioner_name = storage_class['provisioner'].split("/") file_path = "/%s-%s-storage-class.yaml" % ( @@ -133,7 +134,6 @@ class TestDynamicProvisioningP0(CnsBaseClass): oc_create(self.ocp_master_node[0], file_path) self.addCleanup(oc_delete, self.ocp_master_node[0], 'sc', sc_name) - secret = self.cns_secret['secret1'] ret = create_secret_file(self.ocp_master_node[0], secret['secret_name'], secret['namespace'], @@ -191,12 +191,12 @@ class TestDynamicProvisioningP0(CnsBaseClass): cmd, self.ocp_master_node[0])) ret = verify_pod_status_running(self.ocp_master_node[0], "heketi") self.assertTrue(ret, "verify heketi pod status as running failed") - cmd = ("oc get svc | grep heketi | grep -v endpoints " - "| awk '{print $2}'") + cmd = ("oc get svc %s " + "-o=custom-columns=:.spec.clusterIP" % self.heketi_service_name) ret, out, err = g.run(self.ocp_master_node[0], cmd, "root") self.assertEqual(ret, 0, "failed to execute command %s on %s" % ( cmd, self.ocp_master_node[0])) - heketi_cluster_new_ip = out.strip().split("\n")[0] + heketi_cluster_new_ip = out.lstrip().strip() if heketi_cluster_new_ip != heketi_cluster_ip: oc_delete(self.ocp_master_node[0], 'sc', sc_name) resturl = "http://%s:8080" % heketi_cluster_ip @@ -251,14 +251,15 @@ class TestDynamicProvisioningP0(CnsBaseClass): def test_dynamic_provisioning_glusterfile_glusterpod_failure(self): g.log.info("test_dynamic_provisioning_glusterfile_Glusterpod_Failure") storage_class = self.cns_storage_class['storage_class1'] + secret = self.cns_secret['secret1'] sc_name = storage_class['name'] pvc_name4 = "mongodb4" - cmd = ("oc get svc | grep heketi | grep -v endpoints " - "| awk '{print $2}'") + cmd = ("oc get svc %s " + "-o=custom-columns=:.spec.clusterIP" % self.heketi_service_name) ret, out, err = g.run(self.ocp_master_node[0], cmd, "root") self.assertEqual(ret, 0, "failed to execute command %s on %s" % ( cmd, self.ocp_master_node[0])) - heketi_cluster_ip = out.strip().split("\n")[0] + heketi_cluster_ip = out.lstrip().strip() resturl = "http://%s:8080" % heketi_cluster_ip ret = create_storage_class_file( self.ocp_master_node[0], @@ -267,7 +268,7 @@ class TestDynamicProvisioningP0(CnsBaseClass): storage_class['provisioner'], restuser=storage_class['restuser'], secretnamespace=storage_class['secretnamespace'], - secretname=storage_class['secretname']) + secretname=secret['secret_name']) self.assertTrue(ret, "creation of storage-class file failed") provisioner_name = storage_class['provisioner'].split("/") file_path = "/%s-%s-storage-class.yaml" % ( @@ -275,7 +276,6 @@ class TestDynamicProvisioningP0(CnsBaseClass): oc_create(self.ocp_master_node[0], file_path) self.addCleanup(oc_delete, self.ocp_master_node[0], 'sc', sc_name) - secret = self.cns_secret['secret1'] ret = create_secret_file(self.ocp_master_node[0], secret['secret_name'], secret['namespace'], |