LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Cleanup IPsec CTS tests" am: 1d6880153b am: 8493a945b8

Browse Source 
am: 02bfd4d1fb

Change-Id: Ia316904e952167b1890cda1654f95126048885f0
This commit is contained in:
Benedict Wong
2019-05-31 06:17:56 -07:00
committed by android-build-merger
parent 1a1f5e1ff7 02bfd4d1fb
commit 50c4dd0b24
2 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cts/net/src/android/net/cts/IpSecManagerTest.java
View File

@@ -73,12 +73,6 @@ public class IpSecManagerTest extends IpSecBaseTest {
private static final byte[] AEAD_KEY = getKey(288); private static final byte[] AEAD_KEY = getKey(288);
@Before
@Override
public void setUp() throws Exception {
super.setUp();
}
/* /*
* Allocate a random SPI * Allocate a random SPI
* Allocate a specific SPI using previous randomly created SPI value * Allocate a specific SPI using previous randomly created SPI value

34
tests/cts/net/src/android/net/cts/IpSecManagerTunnelTest.java
View File

@@ -129,15 +129,15 @@ public class IpSecManagerTunnelTest extends IpSecBaseTest {
// right appop permissions. // right appop permissions.
setAppop(OP_MANAGE_IPSEC_TUNNELS, true); setAppop(OP_MANAGE_IPSEC_TUNNELS, true);
TestNetworkInterface testIntf = TestNetworkInterface testIface =
sTNM.createTunInterface( sTNM.createTunInterface(
new LinkAddress[] { new LinkAddress[] {
new LinkAddress(LOCAL_OUTER_4, IP4_PREFIX_LEN), new LinkAddress(LOCAL_OUTER_4, IP4_PREFIX_LEN),
new LinkAddress(LOCAL_OUTER_6, IP6_PREFIX_LEN) new LinkAddress(LOCAL_OUTER_6, IP6_PREFIX_LEN)
}); });
sTunFd = testIntf.getFileDescriptor(); sTunFd = testIface.getFileDescriptor();
sTunNetworkCallback = setupAndGetTestNetwork(testIntf.getInterfaceName()); sTunNetworkCallback = setupAndGetTestNetwork(testIface.getInterfaceName());
sTunNetwork = sTunNetworkCallback.getNetworkBlocking(); sTunNetwork = sTunNetworkCallback.getNetworkBlocking();
sTunUtils = new TunUtils(sTunFd); sTunUtils = new TunUtils(sTunFd);
@@ -500,21 +500,20 @@ public class IpSecManagerTunnelTest extends IpSecBaseTest {
mISM.allocateSecurityParameterIndex(localOuter, spi); mISM.allocateSecurityParameterIndex(localOuter, spi);
IpSecManager.SecurityParameterIndex outSpi = IpSecManager.SecurityParameterIndex outSpi =
mISM.allocateSecurityParameterIndex(remoteOuter, spi); mISM.allocateSecurityParameterIndex(remoteOuter, spi);
IpSecManager.IpSecTunnelInterface tunnelIntf = IpSecManager.IpSecTunnelInterface tunnelIface =
mISM.createIpSecTunnelInterface(localOuter, remoteOuter, sTunNetwork)) { mISM.createIpSecTunnelInterface(localOuter, remoteOuter, sTunNetwork)) {
// Build the test network // Build the test network
tunnelIntf.addAddress(localInner, innerPrefixLen); tunnelIface.addAddress(localInner, innerPrefixLen);
testNetworkCb = setupAndGetTestNetwork(tunnelIntf.getInterfaceName()); testNetworkCb = setupAndGetTestNetwork(tunnelIface.getInterfaceName());
Network testNetwork = testNetworkCb.getNetworkBlocking(); Network testNetwork = testNetworkCb.getNetworkBlocking();
// Check interface was created // Check interface was created
NetworkInterface netIntf = NetworkInterface.getByName(tunnelIntf.getInterfaceName()); assertNotNull(NetworkInterface.getByName(tunnelIface.getInterfaceName()));
assertNotNull(netIntf);
// Verify address was added // Verify address was added
netIntf = NetworkInterface.getByInetAddress(localInner); final NetworkInterface netIface = NetworkInterface.getByInetAddress(localInner);
assertNotNull(netIntf); assertNotNull(netIface);
assertEquals(tunnelIntf.getInterfaceName(), netIntf.getDisplayName()); assertEquals(tunnelIface.getInterfaceName(), netIface.getDisplayName());
// Configure Transform parameters // Configure Transform parameters
IpSecTransform.Builder transformBuilder = new IpSecTransform.Builder(sContext); IpSecTransform.Builder transformBuilder = new IpSecTransform.Builder(sContext);
@@ -533,8 +532,9 @@ public class IpSecManagerTunnelTest extends IpSecBaseTest {
transformBuilder.buildTunnelModeTransform(remoteOuter, inSpi); transformBuilder.buildTunnelModeTransform(remoteOuter, inSpi);
IpSecTransform outTransform = IpSecTransform outTransform =
transformBuilder.buildTunnelModeTransform(localOuter, outSpi)) { transformBuilder.buildTunnelModeTransform(localOuter, outSpi)) {
mISM.applyTunnelModeTransform(tunnelIntf, IpSecManager.DIRECTION_IN, inTransform); mISM.applyTunnelModeTransform(tunnelIface, IpSecManager.DIRECTION_IN, inTransform);
mISM.applyTunnelModeTransform(tunnelIntf, IpSecManager.DIRECTION_OUT, outTransform); mISM.applyTunnelModeTransform(
tunnelIface, IpSecManager.DIRECTION_OUT, outTransform);
test.run(testNetwork); test.run(testNetwork);
} }
@@ -543,13 +543,13 @@ public class IpSecManagerTunnelTest extends IpSecBaseTest {
sTNM.teardownTestNetwork(testNetwork); sTNM.teardownTestNetwork(testNetwork);
// Remove addresses and check that interface is still present, but fails lookup-by-addr // Remove addresses and check that interface is still present, but fails lookup-by-addr
tunnelIntf.removeAddress(localInner, innerPrefixLen); tunnelIface.removeAddress(localInner, innerPrefixLen);
assertNotNull(NetworkInterface.getByName(tunnelIntf.getInterfaceName())); assertNotNull(NetworkInterface.getByName(tunnelIface.getInterfaceName()));
assertNull(NetworkInterface.getByInetAddress(localInner)); assertNull(NetworkInterface.getByInetAddress(localInner));
// Check interface was cleaned up // Check interface was cleaned up
tunnelIntf.close(); tunnelIface.close();
assertNull(NetworkInterface.getByName(tunnelIntf.getInterfaceName())); assertNull(NetworkInterface.getByName(tunnelIface.getInterfaceName()));
} finally { } finally {
if (testNetworkCb != null) { if (testNetworkCb != null) {
sCM.unregisterNetworkCallback(testNetworkCb); sCM.unregisterNetworkCallback(testNetworkCb);