Snap for 11104212 from de312f2226271d508eb319ec37a6fa314cdb5c28 to 24Q1-release

Change-Id: Ia2e6deb746118478cbf629a1650c7dad64f2c92a

3 files changed, 69 insertions, 16 deletions

diff --git a/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml b/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml
index 7e4ee44..b1dcd97 100644
--- a/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml
+++ b/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml
@@ -35,21 +35,8 @@
   <!-- Default ABI -->
   <option name="compatibility:primary-abi-only" value="true" />
 
-  <device name="auto" >
-    <!-- Build Provider -->
-    <build_provider class="com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider" />
-    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller" >
-      <option name="test-file-name" value="AutomotiveSnippet.apk" />
-    </target_preparer>
-  </device>
-
-  <device name="phone">
-    <!-- Build Provider -->
-    <build_provider class="com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider" />
-    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller" >
-      <option name="test-file-name" value="PhoneSnippet.apk" />
-    </target_preparer>
-  </device>
+  <!-- Template for Device Configuration -->
+  <template-include name="device-config" default="device-config/two-devices" />
 
   <!--
       CATBox Runs all modules if it is not specified.
@@ -59,7 +46,7 @@
   <option name="compatibility:reverse-exclude-filters" value="true" />
 
   <test class="com.android.tradefed.testtype.mobly.MoblyBinaryHostTest">
-    <!-- The mobly-par-file-name should match the module name -->
+    <!-- The mobly-par-file-name should match the module name , it is passed on runtime-->
     <!-- Timeout limit in milliseconds for all test cases of the python binary -->
     <option name="mobly-test-timeout" value="300000" />
     <!-- Testbed config file -->
diff --git a/tools/catbox-tradefed/res/config/device-config/three-devices.xml b/tools/catbox-tradefed/res/config/device-config/three-devices.xml
new file mode 100644
index 0000000..ebf0151
--- /dev/null
+++ b/tools/catbox-tradefed/res/config/device-config/three-devices.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<configuration description="Bluetooth Device Configuration For Threee Devices">
+  <device name="auto" >
+    <!-- Build Provider -->
+    <build_provider class="com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller" >
+      <option name="test-file-name" value="AutomotiveSnippet.apk" />
+    </target_preparer>
+  </device>
+
+  <device name="phone">
+    <!-- Build Provider -->
+    <build_provider class="com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller" >
+      <option name="test-file-name" value="PhoneSnippet.apk" />
+    </target_preparer>
+  </device>
+
+  <device name="phone_notpaired">
+    <!-- Build Provider -->
+    <build_provider class="com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller" >
+      <option name="test-file-name" value="PhoneSnippet.apk" />
+    </target_preparer>
+  </device>
+</configuration>
\ No newline at end of file
diff --git a/tools/catbox-tradefed/res/config/device-config/two-devices.xml b/tools/catbox-tradefed/res/config/device-config/two-devices.xml
new file mode 100644
index 0000000..9c2ab57
--- /dev/null
+++ b/tools/catbox-tradefed/res/config/device-config/two-devices.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<configuration description="Bluetooth Device Configuration For Two Devices">
+  <device name="auto" >
+    <!-- Build Provider -->
+    <build_provider class="com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller" >
+      <option name="test-file-name" value="AutomotiveSnippet.apk" />
+    </target_preparer>
+  </device>
+
+  <device name="phone">
+    <!-- Build Provider -->
+    <build_provider class="com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller" >
+      <option name="test-file-name" value="PhoneSnippet.apk" />
+    </target_preparer>
+  </device>
+</configuration>
\ No newline at end of file