Signed-off-by: Shinpei Muraoka <[email protected]>
---
ryu/services/protocols/bgp/operator/commands/show/neighbor.py | 2 +-
ryu/services/protocols/bgp/operator/commands/show/rib.py | 11 ++++++++++-
.../bgp/operator/commands/show/route_formatter_mixin.py | 2 +-
ryu/services/protocols/bgp/operator/internal_api.py | 4 ++++
4 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ryu/services/protocols/bgp/operator/commands/show/neighbor.py
b/ryu/services/protocols/bgp/operator/commands/show/neighbor.py
index 8cd4af4..20dcaa6 100644
--- a/ryu/services/protocols/bgp/operator/commands/show/neighbor.py
+++ b/ryu/services/protocols/bgp/operator/commands/show/neighbor.py
@@ -128,7 +128,7 @@ class SentRoutes(Command):
if v.get('timestamp'):
time = strftime("%Y/%m/%d %H:%M:%S", v.get('timestamp'))
ret += cls.fmtstr.format(path_status, time, prefix, labels,
- next_hop, str(med), str(localpref),
+ str(next_hop), str(med), str(localpref),
' '.join(map(str, aspath)))
return ret
diff --git a/ryu/services/protocols/bgp/operator/commands/show/rib.py
b/ryu/services/protocols/bgp/operator/commands/show/rib.py
index 022e35c..33cb2a1 100644
--- a/ryu/services/protocols/bgp/operator/commands/show/rib.py
+++ b/ryu/services/protocols/bgp/operator/commands/show/rib.py
@@ -11,7 +11,16 @@ from .route_formatter_mixin import RouteFormatterMixin
class RibBase(Command, RouteFormatterMixin):
- supported_families = ['ipv4', 'ipv6', 'vpnv4', 'rtfilter', 'vpnv6', 'evpn']
+ supported_families = [
+ 'ipv4',
+ 'ipv6',
+ 'vpnv4',
+ 'vpnv6',
+ 'rtfilter',
+ 'evpn',
+ 'ipv4fs',
+ 'vpnv4fs',
+ ]
class Rib(RibBase):
diff --git
a/ryu/services/protocols/bgp/operator/commands/show/route_formatter_mixin.py
b/ryu/services/protocols/bgp/operator/commands/show/route_formatter_mixin.py
index 4e0a9b3..73f422b 100644
--- a/ryu/services/protocols/bgp/operator/commands/show/route_formatter_mixin.py
+++ b/ryu/services/protocols/bgp/operator/commands/show/route_formatter_mixin.py
@@ -42,7 +42,7 @@ class RouteFormatterMixin(object):
# Append path info to String buffer.
buff.write(cls.fmtstr.format(path_status, prefix, str(labels),
- next_hop, bpr, str(med),
+ str(next_hop), bpr, str(med),
str(localpref),
' '.join(map(str, aspath))))
diff --git a/ryu/services/protocols/bgp/operator/internal_api.py
b/ryu/services/protocols/bgp/operator/internal_api.py
index ae18f42..51352fb 100644
--- a/ryu/services/protocols/bgp/operator/internal_api.py
+++ b/ryu/services/protocols/bgp/operator/internal_api.py
@@ -7,6 +7,8 @@ from ryu.lib.packet.bgp import RF_IPv6_UC
from ryu.lib.packet.bgp import RF_IPv4_VPN
from ryu.lib.packet.bgp import RF_IPv6_VPN
from ryu.lib.packet.bgp import RF_L2_EVPN
+from ryu.lib.packet.bgp import RF_IPv4_FLOWSPEC
+from ryu.lib.packet.bgp import RF_VPNv4_FLOWSPEC
from ryu.lib.packet.bgp import RF_RTC_UC
from ryu.lib.packet.bgp import BGP_ATTR_TYPE_ORIGIN
from ryu.lib.packet.bgp import BGP_ATTR_TYPE_AS_PATH
@@ -84,6 +86,8 @@ class InternalApi(object):
'vpnv4': RF_IPv4_VPN,
'vpnv6': RF_IPv6_VPN,
'evpn': RF_L2_EVPN,
+ 'ipv4fs': RF_IPv4_FLOWSPEC,
+ 'vpnv4fs': RF_VPNv4_FLOWSPEC,
'rtfilter': RF_RTC_UC
}
if addr_family not in rfs:
--
2.7.4
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
