VXLAN-GBP: use common types on the API
Change-Id: I11ec0d7048d36c30a97d437e5b0abd05f06ab0eb Signed-off-by: Neale Ranns <nranns@cisco.com>
This commit is contained in:
committed by
Damjan Marion
parent
0b48cdead5
commit
79a05f5471
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user