openstack/os-ken
Code Issues Proposed changes

ospf: describe prefix in one attribute 'prefix' for ease of use

Browse Source 
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
ISHIDA Wataru 2014-07-02 18:17:46 +09:00 committed by FUJITA Tomonori
parent df7f57e4fe
commit d096f761f4
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ryu/lib/packet/ospf.py
View File

@ -434,11 +434,10 @@ class ExtendedPrefixTLV(ExtendedPrefixTLV):
'prefix']
def __init__(self, type_=OSPF_EXTENDED_PREFIX_TLV, length=0, route_type=0,
prefix_length=0, address_family=0, prefix='0.0.0.0'):
address_family=0, prefix='0.0.0.0/0'):
self.type_ = type_
self.length = length
self.route_type = route_type
self.prefix_length = prefix_length
self.address_family = address_family
self.prefix = prefix
@ -450,14 +449,16 @@ class ExtendedPrefixTLV(ExtendedPrefixTLV):
prefix) = struct.unpack_from(cls._VALUE_PACK_STR, buf)
prefix = addrconv.ipv4.bin_to_text(prefix)
return cls(type_, length, route_type, prefix_length, address_family,
prefix), rest
prefix = "%s/%d" % (prefix, prefix_length)
return cls(type_, length, route_type, address_family, prefix), rest
def serialize(self):
prefix = addrconv.ipv4.text_to_bin(self.prefix)
prefix, prefix_length = self.prefix.split('/')
prefix = addrconv.ipv4.text_to_bin(prefix)
prefix_length = int(prefix_length)
return struct.pack(self._VALUE_PACK_STR, OSPF_EXTENDED_PREFIX_TLV,
self._VALUE_PACK_LEN - 4, self.route_type,
self.prefix_length, self.address_family, 0, prefix)
prefix_length, self.address_family, 0, prefix)
@ExtendedPrefixTLV.register_type(OSPF_EXTENDED_PREFIX_SID_SUBTLV)