Telephony - rework of sample config files and documentation
-Add a README.md to explain the various testbed keys
-Collapse the many sample files into one file
-Update the format for AndroidDevice controller
-Add keys for WiFi and stress testing to the default sample
Bug: 30761646
Change-Id: I65720c0f286ddc82c0986b0737383c4079dba995
diff --git a/acts/tests/google/tel/config/README.md b/acts/tests/google/tel/config/README.md
new file mode 100644
index 0000000..741fd7c
--- /dev/null
+++ b/acts/tests/google/tel/config/README.md
@@ -0,0 +1,17 @@
+## Telephony Testing Config Files
+Telephony config files have some differences from other ACTS configs that require additional keys to be defined in order to run nearly all tests. Below are details of many such keys:
+#### Generally-applicable test keys:
+ - **(\*experimental) enable_wifi_verbose_logging** - This key, if defined (the value is unused), will enable the 'WiFi Verbose Logging' developer option on connected AndroidDevices.
+ - **no_bug_report_on_fail** - The default behavior of telephony tests is to capture a bug report after each failed test. In situations where this is overly time consuming or otherwise not desirable, defining this key (the value is unused) will bypass the process of collecting a bug report.
+ - **sim_conf_file** - Path to a SIM card config file, which is needed in the event that the MSISDN/MDN is not programmed onto SIM cards used in a defined testbed. The file provides key/value pairs mapping ICCIDs to MSISDNs. This file can be generated and amended by the 'manage_sim.py' utility. Its contents are subject to change so users are highly encouraged to use manage_sim.py.
+ - **stress_test_number** - This controls the number of iterations run by "stress" tests. (Tests that require this always have the word "stress" in the test name).
+ - **telephony_auto_rerun** - Because testing with live infrastructure sometimes yields flaky results, when no other options are available to mitigate this uncertainty, this key specifies a maximum number of re-runs that will be performed in the event of a test failure. The test will be reported as a 'pass' after the first successful run.
+ - **wifi_network_pass** - The password to the network specified by *wifi_network_ssid*.
+ - **wifi_network_ssid** - The SSID of a wifi network for test use. This network must have internet access.
+#### Power Test specific keys (TelPowerTest):
+ - **pass_criteria_call_(3g/volte/2g/wfc)** - The maximum amount of power in mW that can be used in steady state during calling power tests in order to pass the test.
+ - **pass_criteria_idle_(3g/volte/2g/wfc)** - The maximum amount of power in mW that can be used in steady state during idle power tests in order to pass the test.
+#### Call-Server test specific keys (TelLiveStressCallTest):
+ - **phone_call_iteration** - The number of calls to be placed in TelLiveStressCallTest
+ - **call_server_number** - the POTS telephone number of a call server used in TelLiveStressCallTest
+
diff --git a/acts/tests/google/tel/config/sample_basic.json b/acts/tests/google/tel/config/sample_basic.json
deleted file mode 100644
index b41f176..0000000
--- a/acts/tests/google/tel/config/sample_basic.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{ "_description": "Sample config file for Live SIM basic testbed.",
- "testbed":
- [
- {
- "_description": "2 android devices with Live SIM. This testbed can run tests requires 2 devices or less, such as voice, message, data tests.",
- "name": "live SIM basic testbed",
- "AndroidDevice": ["<serial_1>", "<serial_2>"]
- }
- ],
- "logpath": "/tmp/logs",
- "testpaths": ["../tests/sample"],
- "sim_conf_file": "../simcard_list.json",
- "adb_logcat_param" : "-b all"
-}
\ No newline at end of file
diff --git a/acts/tests/google/tel/config/sample_conference.json b/acts/tests/google/tel/config/sample_conference.json
deleted file mode 100644
index 9ab9ec0..0000000
--- a/acts/tests/google/tel/config/sample_conference.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{ "_description": "Sample config file for conference testbed",
- "testbed":
- [
- {
- "_description": "3 android devices with Live SIM, for conference call tests.",
- "name": "conference testbed",
- "AndroidDevice": ["<serial_1>", "<serial_2>", "<serial_3>"]
- }
- ],
- "logpath": "/tmp/logs",
- "testpaths": ["../tests/sample"],
- "sim_conf_file": "../simcard_list.json",
- "adb_logcat_param" : "-b all"
-}
\ No newline at end of file
diff --git a/acts/tests/google/tel/config/sample_mobility.json b/acts/tests/google/tel/config/sample_mobility.json
deleted file mode 100644
index 90a4324..0000000
--- a/acts/tests/google/tel/config/sample_mobility.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{ "_description": "Sample config file for mobility testbed.",
- "testbed":
- [
- {
- "_description": "2 android devices, 2 attenuators (control DUT's WiFi or Cellular RSSI). For mobility test, such as WiFi Calling Mobility and Cellular-WiFi switch.",
- "name": "mobility testbed",
- "AndroidDevice": ["<serial_1>", "<serial_2>"],
- "Attenuator": [ {"Model": "<attenuator model name>",
- "InstrumentCount": "<number of instrument>",
- "Address":"<attenuator IP address>",
- "Port":"<attenuator port number>",
- "Paths":["<attenuator paths>"]},
- {"Model": "<attenuator model name>",
- "InstrumentCount": "<number of instrument>",
- "Address":"<attenuator IP address>",
- "Port":"<attenuator port number>",
- "Paths":["<attenuator paths>"]}
- ]
- }
- ],
- "logpath": "/tmp/logs",
- "testpaths": ["../tests/sample"],
- "sim_conf_file": "../simcard_list.json",
- "adb_logcat_param" : "-b all"
-}
\ No newline at end of file
diff --git a/acts/tests/google/tel/config/sample_msim.json b/acts/tests/google/tel/config/sample_msim.json
deleted file mode 100644
index 10ec2fe..0000000
--- a/acts/tests/google/tel/config/sample_msim.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{ "_description": "Sample config file for Multi-SIM basic testbed.",
- "testbed":
- [
- {
- "_description": "2 android devices with Live SIM. Device 1 is MSIM device.",
- "name": "live M-SIM basic testbed",
- "AndroidDevice": [
- {"serial": "<MSIM_device_serial>",
- "default_voice_sim_slot_index": 1,
- "default_data_sim_slot_index": 0,
- "default_message_sim_slot_index": 0,
- "incoming_voice_sim_slot_index": 1,
- "incoming_message_sim_slot_index": 1},
- {"serial": "<Single_SIM_device_serial>"}]
- }
- ],
- "logpath": "/tmp/logs",
- "testpaths": ["../tests/sample"],
- "sim_conf_file": "../simcard_list.json",
- "adb_logcat_param" : "-b all"
-
-}
\ No newline at end of file
diff --git a/acts/tests/google/tel/config/sample_power.json b/acts/tests/google/tel/config/sample_power.json
deleted file mode 100644
index 924c8be..0000000
--- a/acts/tests/google/tel/config/sample_power.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{ "_description": "Sample config file for power testbed",
- "testbed":
- [
- {
- "_description": "Sample testbed with 1 android devices and 1 monsoon device for power test.",
- "name": "power testbed",
- "AndroidDevice": ["<serial>"],
- "Monsoon": ["<monsoon serial>"]
- }
- ],
- "logpath": "/tmp/logs",
- "testpaths": ["../tests/sample"],
- "sim_conf_file": "../simcard_list.json",
- "adb_logcat_param" : "-b all"
-}
\ No newline at end of file
diff --git a/acts/tests/google/tel/config/sample_testbed_configs.json b/acts/tests/google/tel/config/sample_testbed_configs.json
new file mode 100644
index 0000000..8f59cdd
--- /dev/null
+++ b/acts/tests/google/tel/config/sample_testbed_configs.json
@@ -0,0 +1,64 @@
+{ "_description": "Sample config file for live network testing",
+ "testbed":
+ [
+ {
+ "_description": "2 Android devices with Live SIMs.",
+ "name": "sample_basic",
+ "AndroidDevice": [{"serial" : "<serial_1>", "adb_logcat_param": "-b all"},
+ {"serial" : "<serial_2>", "adb_logcat_pram": "-b all"} ]
+ },
+ {
+ "_description": "3 Android devices with Live SIMs usable for Conference Calling.",
+ "name": "sample_conference",
+ "AndroidDevice": [{"serial" : "<serial_1>", "adb_logcat_param": "-b all"},
+ {"serial" : "<serial_2>", "adb_logcat_pram": "-b all"},
+ {"serial" : "<serial_3>", "adb_logcat_pram": "-b all"} ]
+ },
+ {
+ "_description": "2 Android devices, 2 attenuators (control DUT's WiFi or Cellular RSSI)",
+ "name": "sample_mobility",
+ "AndroidDevice": [{"serial" : "<serial_1>", "adb_logcat_param": "-b all"},
+ {"serial" : "<serial_2>", "adb_logcat_pram": "-b all"} ],
+ "Attenuator": [ {"Model": "<attenuator model name>",
+ "InstrumentCount": "<number of instrument>",
+ "Address":"<attenuator IP address>",
+ "Port":"<attenuator port number>",
+ "Paths":["<attenuator paths>"]},
+ {"Model": "<attenuator model name>",
+ "InstrumentCount": "<number of instrument>",
+ "Address":"<attenuator IP address>",
+ "Port":"<attenuator port number>",
+ "Paths":["<attenuator paths>"]}]
+ },
+ {
+ "_description": "2 Multi-SIM Android Devices with live network SIMs",
+ "name": "sample_msim",
+ "AndroidDevice": [
+ {"serial": "<MSIM_device_serial_1>",
+ "default_voice_sim_slot_index": 1,
+ "default_data_sim_slot_index": 0,
+ "default_message_sim_slot_index": 0,
+ "incoming_voice_sim_slot_index": 1,
+ "incoming_message_sim_slot_index": 1},
+ {"serial": "<MSIM_device_serial_2>",
+ "default_voice_sim_slot_index": 1,
+ "default_data_sim_slot_index": 0,
+ "default_message_sim_slot_index": 0,
+ "incoming_voice_sim_slot_index": 1,
+ "incoming_message_sim_slot_index": 1}]
+ },
+ {
+ "_description": "1 Android device and 1 Monsoon Power Monitor.",
+ "name": "sample_power",
+ "AndroidDevice": [{"serial" : "<serial_1>", "adb_logcat_param": "-b all"}],
+ "Monsoon": ["<monsoon serial>"]
+ }
+ ],
+ "logpath": "/tmp/logs",
+ "testpaths": ["../tests/sample"],
+ "sim_conf_file": "./sample_simcard_list.json",
+ "stress_test_number" : 100,
+ "wifi_network_ssid" : "wifi_ssid",
+ "wifi_network_pass" : "wifi_password"
+}
+
diff --git a/acts/tests/google/tel/config/sample_with_wifiap.json b/acts/tests/google/tel/config/sample_with_wifiap.json
deleted file mode 100644
index afd815d..0000000
--- a/acts/tests/google/tel/config/sample_with_wifiap.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{ "_description": "Sample config file for tests require WiFi AP",
- "testbed":
- [
- {
- "_description": "2 android devices, 1 WiFi AP. For tests requires WiFi AP, such as WiFi Calling, WiFi-Cellular Data Switch.",
- "name": "testbed with WiFi AP",
- "AndroidDevice": ["<serial_1>", "<serial_2>"]
- }
- ],
- "logpath": "/tmp/logs",
- "testpaths": ["../tests/sample"],
- "sim_conf_file": "../simcard_list.json",
- "adb_logcat_param" : "-b all",
- "wifi_network_ssid" : "wifi_ssid",
- "wifi_network_pass" : "wifi_password"
-}
\ No newline at end of file
