From 2f1563129ad8d34d365f5ef8620ff76ff7b08e70 Mon Sep 17 00:00:00 2001 From: Paul Vinciguerra Date: Sat, 2 May 2020 22:34:40 -0400 Subject: tests: vpp_interface remove deprecated packed properties The api no longer requires packed ip addresses. Type: test Change-Id: If67365d86b7c3189f871a58234e99f9c8f875371 Signed-off-by: Paul Vinciguerra --- test/test_geneve.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'test/test_geneve.py') diff --git a/test/test_geneve.py b/test/test_geneve.py index 7eb23f27f9b..16cb6c26642 100644 --- a/test/test_geneve.py +++ b/test/test_geneve.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 import socket -from util import ip4_range, ip4_range +from util import ip4_range import unittest from framework import VppTestCase, VppTestRunner from template_bd import BridgeDomain @@ -9,7 +9,8 @@ from template_bd import BridgeDomain from scapy.layers.l2 import Ether from scapy.layers.inet import IP, UDP from scapy.contrib.geneve import GENEVE -from scapy.utils import atol + +import util from vpp_ip_route import VppIpRoute, VppRoutePath from vpp_ip import INVALID_INDEX @@ -176,9 +177,7 @@ class TestGeneve(BridgeDomain, VppTestCase): # Our Multicast address cls.mcast_ip4 = '239.1.1.1' - iplong = atol(cls.mcast_ip4) - cls.mcast_mac = "01:00:5e:%02x:%02x:%02x" % ( - (iplong >> 16) & 0x7F, (iplong >> 8) & 0xFF, iplong & 0xFF) + cls.mcast_mac = util.mcast_ip_to_mac(cls.mcast_ip4) # Create GENEVE VTEP on VPP pg0, and put geneve_tunnel0 and pg1 # into BD. -- cgit 1.2.3-korg