X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_vxlan_gbp.py;h=19790df1f765f1b68d104a0017cdb441b556e476;hb=5d4b8912d2fe186b4fb920a72b3a2f7b556f4e7d;hp=64e51b016cba174aed38aebd828e26ebbf944a27;hpb=770a0deaadfb2d26cbc5da05f84578a7bd92e9d2;p=vpp.git diff --git a/test/test_vxlan_gbp.py b/test/test_vxlan_gbp.py index 64e51b016cb..19790df1f76 100644 --- a/test/test_vxlan_gbp.py +++ b/test/test_vxlan_gbp.py @@ -5,9 +5,9 @@ from util import ip4_range, reassemble4_ether import unittest from framework import VppTestCase, VppTestRunner from template_bd import BridgeDomain -from vpp_ip import VppIpAddress -from scapy.layers.l2 import Ether, Raw +from scapy.layers.l2 import Ether +from scapy.packet import Raw from scapy.layers.inet import IP, UDP from scapy.layers.vxlan import VXLAN from scapy.utils import atol @@ -104,8 +104,8 @@ class TestVxlanGbp(VppTestCase): rip.add_vpp_config() r = cls.vapi.vxlan_gbp_tunnel_add_del( tunnel={ - 'src': VppIpAddress(cls.pg0.local_ip4).encode(), - 'dst': VppIpAddress(dest_ip4).encode(), + 'src': cls.pg0.local_ip4, + 'dst': dest_ip4, 'vni': vni, 'instance': INVALID_INDEX, 'mcast_sw_if_index': INVALID_INDEX, @@ -147,8 +147,8 @@ class TestVxlanGbp(VppTestCase): cls.single_tunnel_bd = 1 r = cls.vapi.vxlan_gbp_tunnel_add_del( tunnel={ - 'src': VppIpAddress(cls.pg0.local_ip4).encode(), - 'dst': VppIpAddress(cls.pg0.remote_ip4).encode(), + 'src': cls.pg0.local_ip4, + 'dst': cls.pg0.remote_ip4, 'vni': cls.single_tunnel_bd, 'instance': INVALID_INDEX, 'mcast_sw_if_index': INVALID_INDEX,