mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-05-09 06:16:10 +02:00
Code Issues Projects Releases Wiki Activity

test_ofctl_v1_2/3: Add a test case of masked metadata

Browse Source 
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
Minoru TAKAHASHI 2014-11-18 13:25:43 +09:00 committed by FUJITA Tomonori
parent b8d7db4076
commit 828b6f48c4
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ryu/tests/unit/lib/test_ofctl.py
View File

@ -94,6 +94,26 @@ def _to_match_ipv6(value):
netmask = network.netmask.words
return ipv6, netmask
def _to_match_metadata(value):
if '/' in value:
metadata = value.split('/')
return _str_to_int(metadata[0]), _str_to_int(metadata[1])
else:
return _str_to_int(value), ofproto_v1_2_parser.UINT64_MAX
def _str_to_int(src):
if isinstance(src, str):
if src.startswith("0x") or src.startswith("0X"):
dst = int(src, 16)
else:
dst = int(src)
else:
dst = src
return dst
conv_dict = {
'eth_src': 'dl_src',
'eth_dst': 'dl_dst',
@ -251,7 +271,12 @@ class Test_ofctl(unittest.TestCase):
eq_(mac.haddr_to_bin(value), field.value)
return
elif key == 'metadata':
eq_(int(value, 16), field.value)
metadata, mask = _to_match_metadata(value)
metadata = metadata & mask
if mask == (1 << 64) - 1:
mask = None
eq_(metadata, field.value)
eq_(mask, field.mask)
return
else:
eq_(value, field.value)
@ -310,7 +335,11 @@ class Test_ofctl(unittest.TestCase):
continue
return
elif key == 'metadata':
eq_(str(int(value, 16)), match_str[key])
metadata_1, mask_1 = _to_match_metadata(value)
metadata_1 = metadata_1 & mask_1
metadata_2, mask_2 = _to_match_metadata(match_str[key])
eq_(metadata_1, metadata_2)
eq_(mask_1, mask_2)
return
eq_(value, match_str[key])
@ -349,6 +378,7 @@ class test_data_v1_2():
{'in_port': 7},
{'in_phy_port': 5, 'in_port': 3},
{'metadata': '0x1212121212121212'},
{'metadata': '0x19af28be37fa91b/0x1010101010101010'},
{'dl_src': "aa:bb:cc:11:22:33"},
{'dl_src': "aa:bb:cc:11:22:33/00:00:00:00:ff:ff"},
{'dl_dst': "aa:bb:cc:11:22:33"},