diff options
| author | Pierre Lee <pierre.lee@mediatek.com> | 2019-07-29 14:33:04 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-29 14:33:04 -0700 |
| commit | 765503ee2a99b865dc7bba30219408238ae61a8b (patch) | |
| tree | 02655f29619ed06cf48fa53aaecf032fb3fed0da | |
| parent | 777b177c6ff6583cee0665682e1f95c99f38d9b6 (diff) | |
| parent | fc4ca0f83ce236c4ea620877e1bd138f3c8bc9e0 (diff) | |
| download | tests-android10-qpr1-mainline-release.tar.gz | |
Add the same mark with policy in SaInfo API am: 5dbde7434bandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-d4-s1-releaseandroid10-d4-release
am: fc4ca0f83c
Change-Id: Ia0338dec19a288ff53db50a5b6ad72db9a24c277
| -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 afcacde..64be084 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__": |