From: Paul Vinciguerra <pvinci@vinciconsulting.com>
Date: Sun, 25 Nov 2018 18:46:44 +0000 (-0800)
Subject: VPP-1508 python3 tests  locals()
X-Git-Tag: v19.04-rc0~323
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=commitdiff_plain;h=9db94454b979d54d9a4bbaeb335582adacba9943

VPP-1508 python3 tests  locals()

Do not use locals() for string formatting.

Change-Id: I2e811f479198159b4005fa69c09ad903944d8ae3
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
---

diff --git a/test/test_l2bd_arp_term.py b/test/test_l2bd_arp_term.py
index 23742b17f85..92942d38789 100644
--- a/test/test_l2bd_arp_term.py
+++ b/test/test_l2bd_arp_term.py
@@ -156,12 +156,13 @@ class TestL2bdArpTerm(VppTestCase):
     def arp_resp_hosts(self, src_host, pkts):
         return {self.arp_resp_host(src_host, p) for p in pkts}
 
-    def inttoip4(self, ip):
+    @staticmethod
+    def inttoip4(ip):
         o1 = int(ip / 16777216) % 256
         o2 = int(ip / 65536) % 256
         o3 = int(ip / 256) % 256
         o4 = int(ip) % 256
-        return '%(o1)s.%(o2)s.%(o3)s.%(o4)s' % locals()
+        return '%s.%s.%s.%s' % (o1, o2, o3, o4)
 
     def arp_event_host(self, e):
         return Host(mac=':'.join(['%02x' % ord(char) for char in e.new_mac]),