aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvalentin boucher <valentin.boucher@orange.com>2017-05-22 13:11:04 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-22 13:11:04 +0000
commitc1a6979eb1c51083d357afa5caee12539f94b777 (patch)
tree7b44c5b63cbef69686a808f03e1fa49533ba26e9
parentd71eadbd067f590ab0f456dfcd603ce183b3779c (diff)
parentd7342a09d909b138faaa15046e9379769ccd3859 (diff)
Merge "Delete line breaks before binary operator"
-rw-r--r--functest/ci/tier_builder.py5
-rw-r--r--functest/utils/openstack_utils.py8
2 files changed, 7 insertions, 6 deletions
diff --git a/functest/ci/tier_builder.py b/functest/ci/tier_builder.py
index 12562f09c..d03cd9032 100644
--- a/functest/ci/tier_builder.py
+++ b/functest/ci/tier_builder.py
@@ -54,8 +54,9 @@ class TierBuilder(object):
blocking=dic_testcase['blocking'],
clean_flag=dic_testcase['clean_flag'],
description=dic_testcase['description'])
- if (testcase.is_compatible(self.ci_installer, self.ci_scenario)
- and testcase.is_enabled()):
+ if (testcase.is_compatible(self.ci_installer,
+ self.ci_scenario) and
+ testcase.is_enabled()):
tier.add_test(testcase)
self.tier_objects.append(tier)
diff --git a/functest/utils/openstack_utils.py b/functest/utils/openstack_utils.py
index 8bd950528..57a2aa2be 100644
--- a/functest/utils/openstack_utils.py
+++ b/functest/utils/openstack_utils.py
@@ -1081,10 +1081,10 @@ def check_security_group_rules(neutron_client, sg_id, direction, protocol,
try:
security_rules = get_security_group_rules(neutron_client, sg_id)
security_rules = [rule for rule in security_rules
- if (rule["direction"].lower() == direction
- and rule["protocol"].lower() == protocol
- and rule["port_range_min"] == port_min
- and rule["port_range_max"] == port_max)]
+ if (rule["direction"].lower() == direction and
+ rule["protocol"].lower() == protocol and
+ rule["port_range_min"] == port_min and
+ rule["port_range_max"] == port_max)]
if len(security_rules) == 0:
return True
else: