Google Git
Sign in
android/platform/packages/modules/NetworkStack/63331ec31bfe733b134ed882d353874e9721ae6d^1..63331ec31bfe733b134ed882d353874e9721ae6d/.
commit
63331ec31bfe733b134ed882d353874e9721ae6d
[log]
author
Yuyang Huang <yuyanghuang@google.com>
Sat Jun 08 08:06:23 2024 +0000
committer
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Sat Jun 08 08:06:23 2024 +0000
tree
e2e4f55bc3de1ee8aad94f126689678e34cfebb8
parent
1276334c2019e7b62e7c0aed03ffc7916ba3a07d [diff]
parent
41f3d2a1114272074480bdd077c0e0c8bc633beb [diff]
Remove new Apf RA filter tests in LegacyApfTest am: 8dab1771ab am: 41f3d2a111

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/3120151

Change-Id: Id98d39c66142d7c7c587e4c9014e84905b47414b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

diff --git a/tests/unit/src/android/net/apf/LegacyApfTest.java b/tests/unit/src/android/net/apf/LegacyApfTest.java
index f51ecdd..cb3fbca 100644
--- a/tests/unit/src/android/net/apf/LegacyApfTest.java
+++ b/tests/unit/src/android/net/apf/LegacyApfTest.java

@@ -1766,267 +1766,6 @@
         }
     }
 
-    // Test for go/apf-ra-filter Case 1a.
-    // Old lifetime is 0
-    @Test
-    public void testAcceptRaMinLftCase1a() throws Exception {
-        final MockIpClientCallback ipClientCallback = new MockIpClientCallback();
-        // configure accept_ra_min_lft
-        final ApfConfiguration config = getDefaultConfig();
-        config.acceptRaMinLft = 180;
-        final TestApfFilter apfFilter = new TestApfFilter(mContext, config, ipClientCallback,
-                mNetworkQuirkMetrics, mDependencies);
-
-        // Create an initial RA and build an APF program
-        byte[] ra = new RaPacketBuilder(1800 /* router lifetime */)
-                .addPioOption(1800 /*valid*/, 0 /*preferred*/, "2001:db8::/64")
-                .build();
-
-        apfFilter.pretendPacketReceived(ra);
-        byte[] program = ipClientCallback.assertProgramUpdateAndGet();
-
-        // repeated RA is dropped
-        assertDrop(program, ra);
-
-        // PIO preferred lifetime increases
-        ra = new RaPacketBuilder(1800 /* router lifetime */)
-                .addPioOption(1800 /*valid*/, 1 /*preferred*/, "2001:db8::/64")
-                .build();
-        assertPass(program, ra);
-    }
-
-    // Test for go/apf-ra-filter Case 2a.
-    // Old lifetime is > 0
-    @Test
-    public void testAcceptRaMinLftCase2a() throws Exception {
-        final MockIpClientCallback ipClientCallback = new MockIpClientCallback();
-        // configure accept_ra_min_lft
-        final ApfConfiguration config = getDefaultConfig();
-        config.acceptRaMinLft = 180;
-        final TestApfFilter apfFilter = new TestApfFilter(mContext, config, ipClientCallback,
-                mNetworkQuirkMetrics, mDependencies);
-
-        // Create an initial RA and build an APF program
-        byte[] ra = new RaPacketBuilder(1800 /* router lifetime */)
-                .addPioOption(1800 /*valid*/, 100 /*preferred*/, "2001:db8::/64")
-                .build();
-
-        apfFilter.pretendPacketReceived(ra);
-        byte[] program = ipClientCallback.assertProgramUpdateAndGet();
-
-        // repeated RA is dropped
-        assertDrop(program, ra);
-
-        // PIO preferred lifetime increases
-        ra = new RaPacketBuilder(1800 /* router lifetime */)
-                .addPioOption(1800 /*valid*/, 101 /*preferred*/, "2001:db8::/64")
-                .build();
-        assertPass(program, ra);
-
-        // PIO preferred lifetime decreases significantly
-        ra = new RaPacketBuilder(1800 /* router lifetime */)
-                .addPioOption(1800 /*valid*/, 33 /*preferred*/, "2001:db8::/64")
-                .build();
-        assertPass(program, ra);
-    }
-
-
-    // Test for go/apf-ra-filter Case 1b.
-    // Old lifetime is 0
-    @Test
-    public void testAcceptRaMinLftCase1b() throws Exception {
-        final MockIpClientCallback ipClientCallback = new MockIpClientCallback();
-        // configure accept_ra_min_lft
-        final ApfConfiguration config = getDefaultConfig();
-        config.acceptRaMinLft = 180;
-        final TestApfFilter apfFilter = new TestApfFilter(mContext, config, ipClientCallback,
-                mNetworkQuirkMetrics, mDependencies);
-
-        // Create an initial RA and build an APF program
-        byte[] ra = new RaPacketBuilder(0 /* router lifetime */).build();
-
-        apfFilter.pretendPacketReceived(ra);
-        byte[] program = ipClientCallback.assertProgramUpdateAndGet();
-
-        // repeated RA is dropped
-        assertDrop(program, ra);
-
-        // lifetime increases below accept_ra_min_lft
-        ra = new RaPacketBuilder(179 /* router lifetime */).build();
-        assertDrop(program, ra);
-
-        // lifetime increases to accept_ra_min_lft
-        ra = new RaPacketBuilder(180 /* router lifetime */).build();
-        assertPass(program, ra);
-    }
-
-
-    // Test for go/apf-ra-filter Case 2b.
-    // Old lifetime is < accept_ra_min_lft (but not 0).
-    @Test
-    public void testAcceptRaMinLftCase2b() throws Exception {
-        final MockIpClientCallback ipClientCallback = new MockIpClientCallback();
-        // configure accept_ra_min_lft
-        final ApfConfiguration config = getDefaultConfig();
-        config.acceptRaMinLft = 180;
-        final TestApfFilter apfFilter = new TestApfFilter(mContext, config, ipClientCallback,
-                mNetworkQuirkMetrics, mDependencies);
-
-        // Create an initial RA and build an APF program
-        byte[] ra = new RaPacketBuilder(100 /* router lifetime */).build();
-
-        apfFilter.pretendPacketReceived(ra);
-        byte[] program = ipClientCallback.assertProgramUpdateAndGet();
-
-        // repeated RA is dropped
-        assertDrop(program, ra);
-
-        // lifetime increases
-        ra = new RaPacketBuilder(101 /* router lifetime */).build();
-        assertDrop(program, ra);
-
-        // lifetime decreases significantly
-        ra = new RaPacketBuilder(1 /* router lifetime */).build();
-        assertDrop(program, ra);
-
-        // equals accept_ra_min_lft
-        ra = new RaPacketBuilder(180 /* router lifetime */).build();
-        assertPass(program, ra);
-
-        // lifetime is 0
-        ra = new RaPacketBuilder(0 /* router lifetime */).build();
-        assertPass(program, ra);
-    }
-
-    // Test for go/apf-ra-filter Case 3b.
-    // Old lifetime is >= accept_ra_min_lft and <= 3 * accept_ra_min_lft
-    @Test
-    public void testAcceptRaMinLftCase3b() throws Exception {
-        final MockIpClientCallback ipClientCallback = new MockIpClientCallback();
-        // configure accept_ra_min_lft
-        final ApfConfiguration config = getDefaultConfig();
-        config.acceptRaMinLft = 180;
-        final TestApfFilter apfFilter = new TestApfFilter(mContext, config, ipClientCallback,
-                mNetworkQuirkMetrics, mDependencies);
-
-        // Create an initial RA and build an APF program
-        byte[] ra = new RaPacketBuilder(200 /* router lifetime */).build();
-
-        apfFilter.pretendPacketReceived(ra);
-        byte[] program = ipClientCallback.assertProgramUpdateAndGet();
-
-        // repeated RA is dropped
-        assertDrop(program, ra);
-
-        // lifetime increases
-        ra = new RaPacketBuilder(201 /* router lifetime */).build();
-        assertPass(program, ra);
-
-        // lifetime is below accept_ra_min_lft (but not 0)
-        ra = new RaPacketBuilder(1 /* router lifetime */).build();
-        assertDrop(program, ra);
-
-        // lifetime is 0
-        ra = new RaPacketBuilder(0 /* router lifetime */).build();
-        assertPass(program, ra);
-    }
-
-    // Test for go/apf-ra-filter Case 4b.
-    // Old lifetime is > 3 * accept_ra_min_lft
-    @Test
-    public void testAcceptRaMinLftCase4b() throws Exception {
-        final MockIpClientCallback ipClientCallback = new MockIpClientCallback();
-        // configure accept_ra_min_lft
-        final ApfConfiguration config = getDefaultConfig();
-        config.acceptRaMinLft = 180;
-        final TestApfFilter apfFilter = new TestApfFilter(mContext, config, ipClientCallback,
-                mNetworkQuirkMetrics, mDependencies);
-
-        // Create an initial RA and build an APF program
-        byte[] ra = new RaPacketBuilder(1800 /* router lifetime */).build();
-
-        apfFilter.pretendPacketReceived(ra);
-        byte[] program = ipClientCallback.assertProgramUpdateAndGet();
-
-        // repeated RA is dropped
-        assertDrop(program, ra);
-
-        // lifetime increases
-        ra = new RaPacketBuilder(1801 /* router lifetime */).build();
-        assertPass(program, ra);
-
-        // lifetime is 1/3 of old lft
-        ra = new RaPacketBuilder(600 /* router lifetime */).build();
-        assertDrop(program, ra);
-
-        // lifetime is below 1/3 of old lft
-        ra = new RaPacketBuilder(599 /* router lifetime */).build();
-        assertPass(program, ra);
-
-        // lifetime is below accept_ra_min_lft (but not 0)
-        ra = new RaPacketBuilder(1 /* router lifetime */).build();
-        assertDrop(program, ra);
-
-        // lifetime is 0
-        ra = new RaPacketBuilder(0 /* router lifetime */).build();
-        assertPass(program, ra);
-    }
-
-    @Test
-    public void testRaFilterIsUpdated() throws Exception {
-        final MockIpClientCallback ipClientCallback = new MockIpClientCallback();
-        // configure accept_ra_min_lft
-        final ApfConfiguration config = getDefaultConfig();
-        config.acceptRaMinLft = 180;
-        final TestApfFilter apfFilter = new TestApfFilter(mContext, config, ipClientCallback,
-                mNetworkQuirkMetrics, mDependencies);
-
-        // Create an initial RA and build an APF program
-        byte[] ra = new RaPacketBuilder(1800 /* router lifetime */).build();
-        apfFilter.pretendPacketReceived(ra);
-        byte[] program = ipClientCallback.assertProgramUpdateAndGet();
-
-        // repeated RA is dropped.
-        assertDrop(program, ra);
-
-        // updated RA is passed, repeated RA is dropped after program update.
-        ra = new RaPacketBuilder(599 /* router lifetime */).build();
-        assertPass(program, ra);
-        apfFilter.pretendPacketReceived(ra);
-        program = ipClientCallback.assertProgramUpdateAndGet();
-        assertDrop(program, ra);
-
-        ra = new RaPacketBuilder(180 /* router lifetime */).build();
-        assertPass(program, ra);
-        apfFilter.pretendPacketReceived(ra);
-        program = ipClientCallback.assertProgramUpdateAndGet();
-        assertDrop(program, ra);
-
-        ra = new RaPacketBuilder(0 /* router lifetime */).build();
-        assertPass(program, ra);
-        apfFilter.pretendPacketReceived(ra);
-        program = ipClientCallback.assertProgramUpdateAndGet();
-        assertDrop(program, ra);
-
-        ra = new RaPacketBuilder(180 /* router lifetime */).build();
-        assertPass(program, ra);
-        apfFilter.pretendPacketReceived(ra);
-        program = ipClientCallback.assertProgramUpdateAndGet();
-        assertDrop(program, ra);
-
-        ra = new RaPacketBuilder(599 /* router lifetime */).build();
-        assertPass(program, ra);
-        apfFilter.pretendPacketReceived(ra);
-        program = ipClientCallback.assertProgramUpdateAndGet();
-        assertDrop(program, ra);
-
-        ra = new RaPacketBuilder(1800 /* router lifetime */).build();
-        assertPass(program, ra);
-        apfFilter.pretendPacketReceived(ra);
-        program = ipClientCallback.assertProgramUpdateAndGet();
-        assertDrop(program, ra);
-    }
-
     private TestAndroidPacketFilter makeTestApfFilter(ApfConfiguration config,
             MockIpClientCallback ipClientCallback) throws Exception {
         return new TestLegacyApfFilter(mContext, config, ipClientCallback, mIpConnectivityLog,