Merge "Fix pep8 W605 rule violation"

4 files changed, 27 insertions, 65 deletions

diff --git a/cns-libs/cnslibs/common/openshift_ops.py b/cns-libs/cnslibs/common/openshift_ops.py
index 6cfff3f8..3eb78c8a 100644
--- a/cns-libs/cnslibs/common/openshift_ops.py
+++ b/cns-libs/cnslibs/common/openshift_ops.py
@@ -28,10 +28,10 @@ from cnslibs.common.heketi_ops import (
 )
 
 PODS_WIDE_RE = re.compile(
-    '(\S+)\s+(\S+)\s+(\w+)\s+(\d+)\s+(\S+)\s+(\S+)\s+(\S+).*\n')
+    r'(\S+)\s+(\S+)\s+(\w+)\s+(\d+)\s+(\S+)\s+(\S+)\s+(\S+).*\n')
 SERVICE_STATUS = "systemctl status %s"
 SERVICE_RESTART = "systemctl restart %s"
-SERVICE_STATUS_REGEX = "Active: active \((.*)\) since .*;.*"
+SERVICE_STATUS_REGEX = r"Active: active \((.*)\) since .*;.*"
 OC_VERSION = None
 
 
@@ -364,11 +364,11 @@ def oc_create_app_dc_with_io(
     Args:
         hostname (str): Node on which 'oc create' command will be executed.
         pvc_name (str): name of the Persistent Volume Claim to attach to
-                        the application PODs where constant I\O will run.
+                        the application PODs where constant I/O will run.
         dc_name_prefix (str): DC name will consist of this prefix and
                               random str.
         replicas (int): amount of application POD replicas.
-        space_to_use (int): value in bytes which will be used for I\O.
+        space_to_use (int): value in bytes which will be used for I/O.
     """
     dc_name = "%s-%s" % (dc_name_prefix, utils.get_random_str())
     container_data = {
@@ -713,9 +713,9 @@ def get_gluster_pod_names_by_pvc_name(ocp_node, pvc_name):
     """
     # Check storage provisioner
     sp_cmd = (
-        'oc get pvc %s --no-headers -o=custom-columns='
-        ':.metadata.annotations."volume\.beta\.kubernetes\.io\/'
-        'storage\-provisioner"' % pvc_name)
+        r'oc get pvc %s --no-headers -o=custom-columns='
+        r':.metadata.annotations."volume\.beta\.kubernetes\.io\/'
+        r'storage\-provisioner"' % pvc_name)
     sp_raw = command.cmd_run(sp_cmd, hostname=ocp_node)
     sp = sp_raw.strip()
 
@@ -836,10 +836,10 @@ def get_gluster_blockvol_info_by_pvc_name(ocp_node, heketi_server_url,
 
     # Get block volume Name and ID from PV which is bound to our PVC
     get_block_vol_data_cmd = (
-        'oc get pv --no-headers -o custom-columns='
-        ':.metadata.annotations.glusterBlockShare,'
-        ':.metadata.annotations."gluster\.org\/volume\-id",'
-        ':.spec.claimRef.name | grep "%s"' % pvc_name)
+        r'oc get pv --no-headers -o custom-columns='
+        r':.metadata.annotations.glusterBlockShare,'
+        r':.metadata.annotations."gluster\.org\/volume\-id",'
+        r':.spec.claimRef.name | grep "%s"' % pvc_name)
     out = command.cmd_run(get_block_vol_data_cmd, hostname=ocp_node)
     parsed_out = filter(None, map(str.strip, out.split(" ")))
     assert len(parsed_out) == 3, "Expected 3 fields in following: %s" % out
@@ -1205,11 +1205,10 @@ def get_vol_names_from_pv(hostname, pv_name):
                     otherwise raise Exception
     '''
     vol_dict = {}
-    cmd = ("oc get pv %s -o=custom-columns="
-           ":.metadata.annotations."
-           "'gluster\.kubernetes\.io\/heketi\-volume\-id',"
-           ":.spec.glusterfs.path"
-           % pv_name)
+    cmd = (r"oc get pv %s -o=custom-columns="
+           r":.metadata.annotations."
+           r"'gluster\.kubernetes\.io\/heketi\-volume\-id',"
+           r":.spec.glusterfs.path" % pv_name)
     vol_list = command.cmd_run(cmd, hostname=hostname).split()
     vol_dict = {"heketi_vol": vol_list[0],
                 "gluster_vol": vol_list[1]}
@@ -1413,9 +1412,9 @@ def match_pv_and_heketi_block_volumes(
         pvc_prefix (str): pv prefix given by user at the time of pvc creation
     """
     custom_columns = [
-        ':.spec.claimRef.name',
-        ':.metadata.annotations."pv\.kubernetes\.io\/provisioned\-by"',
-        ':.metadata.annotations."gluster\.org\/volume\-id"'
+        r':.spec.claimRef.name',
+        r':.metadata.annotations."pv\.kubernetes\.io\/provisioned\-by"',
+        r':.metadata.annotations."gluster\.org\/volume\-id"'
     ]
     pv_block_volumes = sorted([
         pv[2]
diff --git a/cns-libs/cnslibs/common/utils.py b/cns-libs/cnslibs/common/utils.py
index 9aa38ff9..2d16c497 100644
--- a/cns-libs/cnslibs/common/utils.py
+++ b/cns-libs/cnslibs/common/utils.py
@@ -5,47 +5,10 @@ For example, not specific to OCP, Gluster, Heketi, etc.
 """
 
 import random
-import re
 import string
 
-from glusto.core import Glusto as g
-
 from prometheus_client.parser import text_string_to_metric_families
 
-ONE_GB_BYTES = 1073741824.0
-
-
-def get_device_size(host, device_name):
-    """Gets device size for the given device name.
-
-    Args:
-        host (str): Node in command will be executed.
-        device_name (str): device name for which the size has to
-            be calculated.
-
-    Returns:
-        str : returns device size in GB on success
-            False otherwise
-
-    Example:
-        get_device_size(host, device_name)
-    """
-
-    cmd = "fdisk -l %s " % device_name
-    ret, out, _ = g.run(host, cmd)
-    if ret != 0:
-        g.log.error("Failed to execute fdisk -l command "
-                    "on node %s" % host)
-        return False
-
-    regex = 'Disk\s' + device_name + '.*?,\s(\d+)\sbytes\,.*'
-    match = re.search(regex, out)
-    if match is None:
-        g.log.error("Regex mismatch while parsing fdisk -l output")
-        return False
-
-    return str(int(int(match.group(1))/ONE_GB_BYTES))
-
 
 def get_random_str(size=14):
     chars = string.ascii_lowercase + string.digits
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 c717e44e..ecd47176 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
@@ -95,8 +95,8 @@ class TestDynamicProvisioningBlockP0(CnsGlusterBlockBaseClass):
                     pv_name = get_pv_name_from_pvc(self.node, pvc_name)
                     self.addCleanup(oc_delete, self.node, 'pv', pv_name,
                                     raise_on_absence=False)
-                    custom = (':.metadata.annotations."gluster\.kubernetes'
-                              '\.io\/heketi\-volume\-id"')
+                    custom = (r':.metadata.annotations."gluster\.kubernetes'
+                              r'\.io\/heketi\-volume\-id"')
                     vol_id = oc_get_custom_resource(
                         self.node, 'pv', custom, pv_name)[0]
                     self.addCleanup(heketi_blockvolume_delete,
@@ -408,8 +408,8 @@ class TestDynamicProvisioningBlockP0(CnsGlusterBlockBaseClass):
         # get the name of volume
         pv_name = get_pv_name_from_pvc(self.node, self.pvc_name)
 
-        custom = [':.metadata.annotations."gluster\.org\/volume\-id"',
-                  ':.spec.persistentVolumeReclaimPolicy']
+        custom = [r':.metadata.annotations."gluster\.org\/volume\-id"',
+                  r':.spec.persistentVolumeReclaimPolicy']
         vol_id, reclaim_policy = oc_get_custom_resource(
             self.node, 'pv', custom, pv_name)
 
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 2f43ff1e..2f2a0aa3 100644
--- a/tests/functional/common/provisioning/test_dynamic_provisioning_p0_cases.py
+++ b/tests/functional/common/provisioning/test_dynamic_provisioning_p0_cases.py
@@ -92,8 +92,8 @@ class TestDynamicProvisioningP0(CnsBaseClass):
                     pv_name = get_pv_name_from_pvc(self.node, pvc_name)
                     self.addCleanup(oc_delete, self.node, 'pv', pv_name,
                                     raise_on_absence=False)
-                    custom = (':.metadata.annotations."gluster\.kubernetes'
-                              '\.io\/heketi\-volume\-id"')
+                    custom = (r':.metadata.annotations."gluster\.kubernetes'
+                              r'\.io\/heketi\-volume\-id"')
                     vol_id = oc_get_custom_resource(
                         self.node, 'pv', custom, pv_name)[0]
                     self.addCleanup(heketi_volume_delete,
@@ -455,9 +455,9 @@ class TestDynamicProvisioningP0(CnsBaseClass):
 
         # get the name of the volume
         pv_name = get_pv_name_from_pvc(self.node, self.pvc_name)
-        custom = [':.metadata.annotations.'
-                  '"gluster\.kubernetes\.io\/heketi\-volume\-id"',
-                  ':.spec.persistentVolumeReclaimPolicy']
+        custom = [r':.metadata.annotations.'
+                  r'"gluster\.kubernetes\.io\/heketi\-volume\-id"',
+                  r':.spec.persistentVolumeReclaimPolicy']
 
         vol_id, reclaim_policy = oc_get_custom_resource(
             self.node, 'pv', custom, pv_name)