summaryrefslogtreecommitdiffstats
path: root/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py
diff options
context:
space:
mode:
authorValerii Ponomarov <vponomar@redhat.com>2019-08-30 18:58:22 +0530
committervponomar <vponomar@redhat.com>2019-09-03 12:29:39 +0000
commitf711a5f1dd6df3e661d31b723792e5682e900773 (patch)
treee0fc7bc168ea2afbd40660e7a95875045a6958ed /openshift-storage-libs/openshiftstoragelibs/openshift_ops.py
parent5c2f44b77449f47c5c9f437d580c2c6a73e27af0 (diff)
Fix pep8 errors in the files of the 'openshift-storage-libs' dir
Change-Id: Iaa7deca275958d4de68601dc16d1920f3dab85f2
Diffstat (limited to 'openshift-storage-libs/openshiftstoragelibs/openshift_ops.py')
-rw-r--r--openshift-storage-libs/openshiftstoragelibs/openshift_ops.py28
1 files changed, 13 insertions, 15 deletions
diff --git a/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py b/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py
index 6677bb8..d3cd172 100644
--- a/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py
+++ b/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py
@@ -655,11 +655,10 @@ def get_gluster_host_ips_by_pvc_name(ocp_node, pvc_name):
]
elif sp == "gluster.org/glusterblock":
get_gluster_pod_node_ip_cmd = (
- r"""oc get pv --template '{{range .items}}""" +
- r"""{{if eq .spec.claimRef.name "%s"}}""" +
- r"""{{.spec.iscsi.targetPortal}}{{" "}}""" +
- r"""{{.spec.iscsi.portals}}{{end}}{{end}}'""") % (
- pvc_name)
+ r"""oc get pv --template '{{range .items}}"""
+ + r"""{{if eq .spec.claimRef.name "%s"}}"""
+ + r"""{{.spec.iscsi.targetPortal}}{{" "}}"""
+ + r"""{{.spec.iscsi.portals}}{{end}}{{end}}'""") % pvc_name
node_ips_raw = command.cmd_run(
get_gluster_pod_node_ip_cmd, hostname=ocp_node)
node_ips_raw = node_ips_raw.replace(
@@ -1120,8 +1119,7 @@ def get_pv_name_from_pvc(hostname, pvc_name):
cmd = ("oc get pvc %s -o=custom-columns=:."
"spec.volumeName" % pvc_name)
pv_name = command.cmd_run(cmd, hostname=hostname)
- g.log.info("pv name is %s for pvc %s" % (
- pv_name, pvc_name))
+ g.log.info("pv name is %s for pvc %s" % (pv_name, pvc_name))
return pv_name
@@ -1301,8 +1299,8 @@ def match_pv_and_heketi_block_volumes(
err_msg = "PV block volumes and Heketi Block volume list match failed"
err_msg += "\nPV Block Volumes: %s, " % pv_block_volumes
err_msg += "\nHeketi Block volumes %s" % heketi_block_volumes
- err_msg += "\nDifference: %s" % (set(pv_block_volumes) ^
- set(heketi_block_volumes))
+ err_msg += "\nDifference: %s" % (
+ set(pv_block_volumes) ^ set(heketi_block_volumes))
raise AssertionError(err_msg)
@@ -1336,8 +1334,8 @@ def check_service_status_on_pod(
for line in out.splitlines():
status_match = re.search(SERVICE_STATUS_REGEX, line)
- if (status_match and status_match.group(1) == status and
- status_match.group(2) == state):
+ if (status_match and status_match.group(1) == status
+ and status_match.group(2) == state):
return True
if w.expired:
@@ -1373,8 +1371,8 @@ def wait_for_service_status_on_gluster_pod_or_node(
raise_on_error=raise_on_error)
for line in out.splitlines():
status_match = re.search(SERVICE_STATUS_REGEX, line)
- if (status_match and status_match.group(1) == status and
- status_match.group(2) == state):
+ if (status_match and status_match.group(1) == status
+ and status_match.group(2) == state):
return True
if w.expired:
g.log.error(err_msg)
@@ -1479,8 +1477,8 @@ def get_default_block_hosting_volume_size(hostname, heketi_dc_name):
g.log.error(msg)
raise exceptions.ExecutionError(msg)
- if ('glusterfs' in out.keys() and
- 'block_hosting_volume_size' in out['glusterfs'].keys()):
+ if ('glusterfs' in out.keys()
+ and 'block_hosting_volume_size' in out['glusterfs'].keys()):
return int(out['glusterfs']['block_hosting_volume_size'])
msg = ("Not able to get the value of "
"out['glusterfs']['block_hosting_volume_size'] from out:\n" % out)