aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatus Fabian <matfabia@cisco.com>2016-02-23 08:56:29 +0100
committerGerrit Code Review <gerrit@fd.io>2016-02-23 13:55:03 +0000
commitae7411c745d47a70bb36c3d5cb6b2907f5697e57 (patch)
tree0ec6ed9a2932d48bedcfdc9226e8472b763c5cab
parent44f173ecd1311296e347b066592163e9abbe3483 (diff)
Fixed strings with format splitting
Change-Id: Iaded6b2ba46df86dd89afb2e2dc411d9972fb7d7 Signed-off-by: Matus Fabian <matfabia@cisco.com>
-rw-r--r--resources/libraries/python/NodePath.py2
-rwxr-xr-xresources/traffic_scripts/icmpv6_echo.py2
-rwxr-xr-xresources/traffic_scripts/icmpv6_echo_req_resp.py4
-rwxr-xr-xresources/traffic_scripts/ipv4_sweep_ping.py2
-rwxr-xr-xresources/traffic_scripts/ipv6_sweep_ping.py2
5 files changed, 6 insertions, 6 deletions
diff --git a/resources/libraries/python/NodePath.py b/resources/libraries/python/NodePath.py
index 6700ddfe2a..51808c3edf 100644
--- a/resources/libraries/python/NodePath.py
+++ b/resources/libraries/python/NodePath.py
@@ -117,7 +117,7 @@ class NodePath(object):
l_set = set(links).difference(self._links)
if not l_set:
raise RuntimeError(
- 'No free link between {0} and {1}, all links already ' +
+ 'No free link between {0} and {1}, all links already ' \
'used'.format(node1['host'], node2['host']))
if not l_set:
diff --git a/resources/traffic_scripts/icmpv6_echo.py b/resources/traffic_scripts/icmpv6_echo.py
index 9e9a952d58..09198abe00 100755
--- a/resources/traffic_scripts/icmpv6_echo.py
+++ b/resources/traffic_scripts/icmpv6_echo.py
@@ -76,7 +76,7 @@ def main():
# check identifier and sequence number
if icmpv6.id != echo_id or icmpv6.seq != echo_seq:
raise RuntimeError(
- 'Invalid ICMPv6 echo reply received ID {0} seq {1} should be ' +
+ 'Invalid ICMPv6 echo reply received ID {0} seq {1} should be ' \
'ID {2} seq {3}'.format(icmpv6.id, icmpv6.seq, echo_id, echo_seq))
# verify checksum
diff --git a/resources/traffic_scripts/icmpv6_echo_req_resp.py b/resources/traffic_scripts/icmpv6_echo_req_resp.py
index 48cbda22ae..582114cb28 100755
--- a/resources/traffic_scripts/icmpv6_echo_req_resp.py
+++ b/resources/traffic_scripts/icmpv6_echo_req_resp.py
@@ -97,7 +97,7 @@ def main():
# check identifier and sequence number
if icmpv6.id != echo_id or icmpv6.seq != echo_seq:
raise RuntimeError(
- 'Invalid ICMPv6 echo reply received ID {0} seq {1} should be ' +
+ 'Invalid ICMPv6 echo reply received ID {0} seq {1} should be ' \
'ID {2} seq {3}'.format(icmpv6.id, icmpv6.seq, echo_id, echo_seq))
# verify checksum
@@ -142,7 +142,7 @@ def main():
# check identifier and sequence number
if icmpv6.id != echo_id or icmpv6.seq != echo_seq:
raise RuntimeError(
- 'Invalid ICMPv6 echo reply received ID {0} seq {1} should be ' +
+ 'Invalid ICMPv6 echo reply received ID {0} seq {1} should be ' \
'ID {2} seq {3}'.format(icmpv6.id, icmpv6.seq, echo_id, echo_seq))
# verify checksum
diff --git a/resources/traffic_scripts/ipv4_sweep_ping.py b/resources/traffic_scripts/ipv4_sweep_ping.py
index 6c18f795c2..f7ce5cd943 100755
--- a/resources/traffic_scripts/ipv4_sweep_ping.py
+++ b/resources/traffic_scripts/ipv4_sweep_ping.py
@@ -83,7 +83,7 @@ def main():
if icmpv4.id != echo_id or icmpv4.seq != echo_seq:
raise RuntimeError(
- 'Invalid ICMP echo reply received ID {0} seq {1} should be ' +
+ 'Invalid ICMP echo reply received ID {0} seq {1} should be ' \
'ID {2} seq {3}, {0}'.format(icmpv4.id, icmpv4.seq, echo_id,
echo_seq))
diff --git a/resources/traffic_scripts/ipv6_sweep_ping.py b/resources/traffic_scripts/ipv6_sweep_ping.py
index c1fe7d3f70..cf7dc9e6bc 100755
--- a/resources/traffic_scripts/ipv6_sweep_ping.py
+++ b/resources/traffic_scripts/ipv6_sweep_ping.py
@@ -87,7 +87,7 @@ def main():
if icmpv6.id != echo_id or icmpv6.seq != echo_seq:
raise RuntimeError(
- 'Invalid ICMPv6 echo reply received ID {0} seq {1} should be ' +
+ 'Invalid ICMPv6 echo reply received ID {0} seq {1} should be ' \
'ID {2} seq {3}, {0}'.format(icmpv6.id, icmpv6.seq, echo_id,
echo_seq))