Fixed strings with format splitting

Change-Id: Iaded6b2ba46df86dd89afb2e2dc411d9972fb7d7
Signed-off-by: Matus Fabian <matfabia@cisco.com>

diff --git a/resources/libraries/python/NodePath.py b/resources/libraries/python/NodePath.py
index 6700ddf..51808c3 100644 (file)
--- 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(
                 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:
                         '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 9e9a952..09198ab 100755 (executable)
--- 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(
     # 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
             '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 48cbda2..582114c 100755 (executable)
--- 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(
     # 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
             '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(
     # 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
             '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 6c18f79..f7ce5cd 100755 (executable)
--- 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(
 
         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))
 
                 '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 c1fe7d3..cf7dc9e 100755 (executable)
--- 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(
 
         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))
 
                 'ID {2} seq {3}, {0}'.format(icmpv6.id, icmpv6.seq, echo_id,
                                              echo_seq))