diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-07-25 03:53:02 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-07-25 03:53:02 +0000 |
commit | 97b14e5f8684253ea6c40f6ed95aff8624402cac (patch) | |
tree | 88f021bf405e71f94cf055111ad0caf689649780 /net/test | |
parent | 0f36856b4c07a553d9f1812bd7732f0aded0e06a (diff) | |
parent | c68285f247e30bbcc6c767719a4185ad01129a8c (diff) | |
download | kernel_tests-97b14e5f8684253ea6c40f6ed95aff8624402cac.tar.gz kernel_tests-97b14e5f8684253ea6c40f6ed95aff8624402cac.tar.bz2 kernel_tests-97b14e5f8684253ea6c40f6ed95aff8624402cac.zip |
Merge "Add the same mark with policy in SaInfo API"
Diffstat (limited to 'net/test')
-rwxr-xr-x | net/test/xfrm_test.py | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/net/test/xfrm_test.py b/net/test/xfrm_test.py index afcacde3..64be0848 100755 --- a/net/test/xfrm_test.py +++ b/net/test/xfrm_test.py @@ -846,12 +846,22 @@ class XfrmOutputMarkTest(xfrm_base.XfrmLazyTest): xfrm_base._ALGO_CBC_AES_256) # Add a default SA with no mark that routes to nowhere. - self.xfrm.AddSaInfo(local, - remote, - TEST_SPI, xfrm.XFRM_MODE_TUNNEL, 0, - xfrm_base._ALGO_CBC_AES_256, - xfrm_base._ALGO_HMAC_SHA1, - None, None, None, 0, is_update=False) + try: + self.xfrm.AddSaInfo(local, + remote, + TEST_SPI, xfrm.XFRM_MODE_TUNNEL, 0, + xfrm_base._ALGO_CBC_AES_256, + xfrm_base._ALGO_HMAC_SHA1, + None, None, mark, 0, is_update=False) + except IOError as e: + self.assertEquals(EEXIST, e.errno, "SA exists") + self.xfrm.AddSaInfo(local, + remote, + TEST_SPI, xfrm.XFRM_MODE_TUNNEL, 0, + xfrm_base._ALGO_CBC_AES_256, + xfrm_base._ALGO_HMAC_SHA1, + None, None, mark, 0, is_update=True) + self.assertRaisesErrno( ENETUNREACH, s.sendto, net_test.UDP_PAYLOAD, (remote, 53)) @@ -862,7 +872,7 @@ class XfrmOutputMarkTest(xfrm_base.XfrmLazyTest): TEST_SPI, xfrm.XFRM_MODE_TUNNEL, 0, xfrm_base._ALGO_CBC_AES_256, xfrm_base._ALGO_HMAC_SHA1, - None, None, None, netid, is_update=True) + None, None, mark, netid, is_update=True) # Now the payload routes to the updated netid. s.sendto(net_test.UDP_PAYLOAD, (remote, 53)) @@ -876,7 +886,7 @@ class XfrmOutputMarkTest(xfrm_base.XfrmLazyTest): TEST_SPI, xfrm.XFRM_MODE_TUNNEL, 0, xfrm_base._ALGO_CBC_AES_256, xfrm_base._ALGO_HMAC_SHA1, - None, None, None, reroute_netid, is_update=True) + None, None, mark, reroute_netid, is_update=True) s.sendto(net_test.UDP_PAYLOAD, (remote, 53)) self._ExpectEspPacketOn(reroute_netid, TEST_SPI, 2, length, None, None) @@ -887,7 +897,7 @@ class XfrmOutputMarkTest(xfrm_base.XfrmLazyTest): sainfo, attributes = dump[0] self.assertEquals(reroute_netid, attributes["XFRMA_OUTPUT_MARK"]) - self.xfrm.DeleteSaInfo(remote, TEST_SPI, IPPROTO_ESP, None) + self.xfrm.DeleteSaInfo(remote, TEST_SPI, IPPROTO_ESP, mark) self.xfrm.DeletePolicyInfo(sel, xfrm.XFRM_POLICY_OUT, mark) if __name__ == "__main__": |