From 8c62149ae57ad13fd0f35a3562e8df892e392338 Mon Sep 17 00:00:00 2001 From: Josh Bailey Date: Thu, 22 Dec 2016 17:35:05 +1300 Subject: [PATCH] Ryu 4.9's BGP speaker library, doesn't handle an ipaddr.IPAddress as a nexthop. --- src/ryu_faucet/org/onfsdn/faucet/faucet.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ryu_faucet/org/onfsdn/faucet/faucet.py b/src/ryu_faucet/org/onfsdn/faucet/faucet.py index 03be939d65..04afc91a6a 100644 --- a/src/ryu_faucet/org/onfsdn/faucet/faucet.py +++ b/src/ryu_faucet/org/onfsdn/faucet/faucet.py @@ -173,7 +173,7 @@ def _create_bgp_speaker_for_vlan(self, vlan): prefix = ipaddr.IPNetwork( '/'.join((str(controller_ip.ip), str(controller_ip.prefixlen)))) bgp_speaker.prefix_add( - prefix=str(prefix), next_hop=controller_ip.ip) + prefix=str(prefix), next_hop=str(controller_ip.ip)) for route_table in (vlan.ipv4_routes, vlan.ipv6_routes): for ip_dst, ip_gw in route_table.iteritems(): bgp_speaker.prefix_add( @@ -181,7 +181,9 @@ def _create_bgp_speaker_for_vlan(self, vlan): for bgp_neighbor_address in vlan.bgp_neighbor_addresses: bgp_speaker.neighbor_add( address=bgp_neighbor_address, - remote_as=vlan.bgp_neighbor_as) + remote_as=vlan.bgp_neighbor_as, + enable_ipv4=True, + enable_ipv6=True) return bgp_speaker def _reset_bgp(self):