Commit 05045995 authored by Brenden Blanco's avatar Brenden Blanco

Fix for 2 tests

* name needed to be right ctype
* python runtime was complaining about dangling socket fd
Signed-off-by: default avatarBrenden Blanco <bblanco@plumgrid.com>
parent 19109565
...@@ -169,7 +169,7 @@ class BPF(object): ...@@ -169,7 +169,7 @@ class BPF(object):
ifindex = int(f.read()) ifindex = int(f.read())
if not isinstance(fn, BPF.Function): if not isinstance(fn, BPF.Function):
raise Exception("arg 1 must be of type BPF.Function") raise Exception("arg 1 must be of type BPF.Function")
res = lib.bpf_attach_filter(fn.fd, fn.name, ifindex, prio, classid) res = lib.bpf_attach_filter(fn.fd, fn.name.encode("ascii"), ifindex, prio, classid)
if res < 0: if res < 0:
raise Exception("Failed to filter with BPF") raise Exception("Failed to filter with BPF")
......
...@@ -32,8 +32,8 @@ class TestBPFSocket(TestCase): ...@@ -32,8 +32,8 @@ class TestBPFSocket(TestCase):
key = Key(IPAddress("172.16.1.1").value, IPAddress("172.16.1.2").value) key = Key(IPAddress("172.16.1.1").value, IPAddress("172.16.1.2").value)
leaf = Leaf(IPAddress("192.168.1.1").value, IPAddress("192.168.1.2").value, 0) leaf = Leaf(IPAddress("192.168.1.1").value, IPAddress("192.168.1.2").value, 0)
self.xlate.put(key, leaf) self.xlate.put(key, leaf)
udp = socket(AF_INET, SOCK_DGRAM) with socket(AF_INET, SOCK_DGRAM) as udp:
udp.sendto(b"a" * 10, ("172.16.1.1", 5000)) udp.sendto(b"a" * 10, ("172.16.1.1", 5000))
leaf = self.xlate.get(key) leaf = self.xlate.get(key)
self.assertGreater(leaf.xlated_pkts, 0) self.assertGreater(leaf.xlated_pkts, 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment