diff options
| author |   Neale Ranns <nranns@cisco.com> | 2018-09-11 07:39:43 -0700 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2018-09-12 10:11:18 +0000 |
| commit | 79a05f547146e1eb972ec505e6605f604d3a3054 (patch) | |
| tree | df2d62133079b395b0694732df47059b32c34183 /test/test_vxlan_gbp.py | |
| parent | 0b48cdead5adf07fe684bd909a6f5282e249184c (diff) | |
VXLAN-GBP: use common types on the API
Change-Id: I11ec0d7048d36c30a97d437e5b0abd05f06ab0eb
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'test/test_vxlan_gbp.py')
| -rw-r--r-- | test/test_vxlan_gbp.py | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/test/test_vxlan_gbp.py b/test/test_vxlan_gbp.py index 55594a59fa7..919ecbc6203 100644 --- a/test/test_vxlan_gbp.py +++ b/test/test_vxlan_gbp.py @@ -1,10 +1,11 @@ #!/usr/bin/env python import socket -from util import ip4n_range, ip4_range +from util import ip4_range 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.inet import IP, UDP @@ -106,13 +107,15 @@ class TestVxlanGbp(VppTestCase): ip_range_start = 10 ip_range_end = ip_range_start + n_ucast_tunnels next_hop_address = cls.pg0.remote_ip4n - for dest_ip4n in ip4n_range(next_hop_address, ip_range_start, - ip_range_end): + for dest_ip4 in ip4_range(cls.pg0.remote_ip4, + ip_range_start, + ip_range_end): # add host route so dest_ip4n will not be resolved - cls.vapi.ip_add_del_route(dest_ip4n, 32, next_hop_address) - r = cls.vapi.vxlan_gbp_add_del_tunnel( - src_addr=cls.pg0.local_ip4n, - dst_addr=dest_ip4n, + vip = VppIpAddress(dest_ip4) + cls.vapi.ip_add_del_route(vip.bytes, 32, next_hop_address) + r = cls.vapi.vxlan_gbp_tunnel_add_del( + VppIpAddress(cls.pg0.local_ip4).encode(), + vip.encode(), vni=vni) cls.vapi.sw_interface_set_l2_bridge(r.sw_if_index, bd_id=vni) @@ -145,9 +148,9 @@ class TestVxlanGbp(VppTestCase): # Create VXLAN GBP VTEP on VPP pg0, and put vxlan_gbp_tunnel0 and # pg1 into BD. cls.single_tunnel_bd = 1 - r = cls.vapi.vxlan_gbp_add_del_tunnel( - src_addr=cls.pg0.local_ip4n, - dst_addr=cls.pg0.remote_ip4n, + r = cls.vapi.vxlan_gbp_tunnel_add_del( + VppIpAddress(cls.pg0.local_ip4).encode(), + VppIpAddress(cls.pg0.remote_ip4).encode(), vni=cls.single_tunnel_bd) cls.vapi.sw_interface_set_l2_bridge(r.sw_if_index, bd_id=cls.single_tunnel_bd) |