[Ryu-devel] [PATCH 04/12] packet/bgp: add helper methods to nlri class for bgp ssh client

[ISHIDA Wataru]

Signed-off-by: ISHIDA Wataru <ishida.wat...@lab.ntt.co.jp>
---
 ryu/lib/packet/bgp.py |   44 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/ryu/lib/packet/bgp.py b/ryu/lib/packet/bgp.py
index 8bcffa8..06323a8 100644
--- a/ryu/lib/packet/bgp.py
+++ b/ryu/lib/packet/bgp.py
@@ -716,7 +716,11 @@ class IPAddrPrefix(_UnlabelledAddrPrefix, _IPAddrPrefix):
 
     @property
     def prefix(self):
-        return self.addr
+        return self.addr+'/{0}'.format(self.length)
+
+    @property
+    def formatted_nlri_str(self):
+        return self.prefix
 
 
 class IP6AddrPrefix(_UnlabelledAddrPrefix, _IP6AddrPrefix):
@@ -724,18 +728,54 @@ class IP6AddrPrefix(_UnlabelledAddrPrefix, 
_IP6AddrPrefix):
 
     @property
     def prefix(self):
-        return self.addr
+        return self.addr+'/{0}'.format(self.length)
+
+    @property
+    def formatted_nlri_str(self):
+        return self.prefix
 
 
 class LabelledVPNIPAddrPrefix(_LabelledAddrPrefix, _VPNAddrPrefix,
                               _IPAddrPrefix):
     ROUTE_FAMILY = RF_IPv4_VPN
 
+    @property
+    def prefix(self):
+        return self.addr[-1]+'/{0}'.format(self.length)
+
+    @property
+    def route_disc(self):
+        return self.addr[-2]
+
+    @property
+    def label_list(self):
+        return self.addr[:-2]
+
+    @property
+    def formatted_nlri_str(self):
+        return "%s:%s" % (self.route_disc, self.prefix)
+
 
 class LabelledVPNIP6AddrPrefix(_LabelledAddrPrefix, _VPNAddrPrefix,
                                _IP6AddrPrefix):
     ROUTE_FAMILY = RF_IPv6_VPN
 
+    @property
+    def prefix(self):
+        return self.addr[-1]+'/{0}'.format(self.length)
+
+    @property
+    def route_disc(self):
+        return self.addr[-2]
+
+    @property
+    def label_list(self):
+        return self.addr[:-2]
+
+    @property
+    def formatted_nlri_str(self):
+        return "%s:%s" % (self.route_disc, self.prefix)
+
 
 class RouteTargetMembershipNLRI(StringifyMixin):
     """Route Target Membership NLRI.
-- 
1.7.9.5


------------------------------------------------------------------------------
Is your legacy SCM system holding you back? Join Perforce May 7 to find out:
&#149; 3 signs your SCM is hindering your productivity
&#149; Requirements for releasing software faster
&#149; Expert tips and advice for migrating your SCM now
http://p.sf.net/sfu/perforce
_______________________________________________
Ryu-devel mailing list
Ryu-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ryu-devel