Merge both CEP and none-CEP cases into merge functions
Reason to do this:
1. It's difficult to know whether a carrier supports CEP or not without trial.
2. Each current test case of conference call related to call merge has to be divided into 2 cases "CEP" or "no CEP". This makes the customaization of the test campaign trivial.
3. Whether a carrier supports CEP or not can be actually distinguished by proper algorithm automatically, and it does not impact the test result, either.
Bug: None
Test: yes locally
Change-Id: I8824a9bef2141364a7ec354d4ea52a1c8fd86592
diff --git a/acts/tests/google/tel/live/TelLiveVoiceConfTest.py b/acts/tests/google/tel/live/TelLiveVoiceConfTest.py
index 8488b9c..a719aa1 100644
--- a/acts/tests/google/tel/live/TelLiveVoiceConfTest.py
+++ b/acts/tests/google/tel/live/TelLiveVoiceConfTest.py
@@ -1341,85 +1341,12 @@
return call_ab_id, call_ac_id
- def _test_ims_conference_merge_drop_second_call_no_cep(
- self, call_ab_id, call_ac_id):
- """Test conference merge and drop in VoLTE call.
+ def _merge_ims_conference_call(self, call_ab_id, call_ac_id):
+ """Merge IMS conference call for both cases of CEP enabled and disabled.
PhoneA in IMS (VoLTE or WiFi Calling) call with PhoneB.
PhoneA in IMS (VoLTE or WiFi Calling) call with PhoneC.
Merge calls to conference on PhoneA.
- Hangup on PhoneC, check call continues between AB.
- Hangup on PhoneB, check A ends.
-
- Args:
- call_ab_id: call id for call_AB on PhoneA.
- call_ac_id: call id for call_AC on PhoneA.
-
- Returns:
- True if succeed;
- False if failed.
- """
- ads = self.android_devices
-
- self.log.info("Step4: Merge to Conf Call and verify Conf Call.")
- ads[0].droid.telecomCallJoinCallsInConf(call_ab_id, call_ac_id)
- time.sleep(WAIT_TIME_IN_CALL)
- calls = ads[0].droid.telecomCallGetCallIds()
- ads[0].log.info("Calls in PhoneA %s", calls)
- if num_active_calls(self.log, ads[0]) != 1:
- ads[0].log.error("Total number of call lists is not 1.")
- if get_cep_conference_call_id(ads[0]) is not None:
- self.log.error("CEP enabled.")
- else:
- self.log.error("Merge failed.")
- return False
- call_conf_id = None
- for call_id in calls:
- if call_id != call_ab_id and call_id != call_ac_id:
- call_conf_id = call_id
- if not call_conf_id:
- self.log.error("Merge call fail, no new conference call id.")
- return False
- if not verify_incall_state(self.log, [ads[0], ads[1], ads[2]], True):
- return False
-
- # Check if Conf Call is currently active
- if ads[0].droid.telecomCallGetCallState(
- call_conf_id) != CALL_STATE_ACTIVE:
- ads[0].log.error(
- "Call_id:%s, state:%s, expected: STATE_ACTIVE", call_conf_id,
- ads[0].droid.telecomCallGetCallState(call_conf_id))
- return False
-
- self.log.info("Step5: End call on PhoneC and verify call continues.")
- if not self._hangup_call(ads[2], "PhoneC"):
- return False
- time.sleep(WAIT_TIME_IN_CALL)
- calls = ads[0].droid.telecomCallGetCallIds()
- ads[0].log.info("Calls in PhoneA %s", calls)
- if not verify_incall_state(self.log, [ads[0], ads[1]], True):
- return False
- if not verify_incall_state(self.log, [ads[2]], False):
- return False
-
- # Because of b/18413009, VZW VoLTE conference host will not drop call
- # even if all participants drop. The reason is VZW network is not
- # providing such information to DUT.
- # So this test probably will fail on the last step for VZW.
- self.log.info("Step6: End call on PhoneB and verify PhoneA end.")
- if not self._hangup_call(ads[1], "PhoneB"):
- return False
- time.sleep(WAIT_TIME_IN_CALL)
- if not verify_incall_state(self.log, [ads[0], ads[1], ads[2]], False):
- return False
- return True
-
- def _merge_cep_conference_call(self, call_ab_id, call_ac_id):
- """Merge CEP conference call.
-
- PhoneA in IMS (VoLTE or WiFi Calling) call with PhoneB.
- PhoneA in IMS (VoLTE or WiFi Calling) call with PhoneC.
- Merge calls to conference on PhoneA (CEP enabled IMS conference).
Args:
call_ab_id: call id for call_AB on PhoneA.
@@ -1429,48 +1356,58 @@
call_id for conference
"""
ads = self.android_devices
-
self.log.info("Step4: Merge to Conf Call and verify Conf Call.")
ads[0].droid.telecomCallJoinCallsInConf(call_ab_id, call_ac_id)
time.sleep(WAIT_TIME_IN_CALL)
calls = ads[0].droid.telecomCallGetCallIds()
ads[0].log.info("Calls in PhoneA %s", calls)
- call_conf_id = get_cep_conference_call_id(ads[0])
- if call_conf_id is None:
- self.log.error(
- "No call with children. Probably CEP not enabled or merge failed."
- )
- return None
- calls.remove(call_conf_id)
- if (set(ads[0].droid.telecomCallGetCallChildren(call_conf_id)) !=
- set(calls)):
- ads[0].log.error(
- "Children list %s for conference call is not correct.",
- ads[0].droid.telecomCallGetCallChildren(call_conf_id))
- return None
+ call_conf_id = None
+ if num_active_calls(self.log, ads[0]) != 1:
+ ads[0].log.info("Total number of call ids is not 1.")
+ call_conf_id = get_cep_conference_call_id(ads[0])
+ if call_conf_id is not None:
+ self.log.info("New conference call id is found. CEP enabled.")
+ calls.remove(call_conf_id)
+ if (set(ads[0].droid.telecomCallGetCallChildren(
+ call_conf_id)) != set(calls)):
+ ads[0].log.error(
+ "Children list %s for conference call is not correct.",
+ ads[0].droid.telecomCallGetCallChildren(call_conf_id))
+ return None
- if (CALL_PROPERTY_CONFERENCE not in ads[0]
- .droid.telecomCallGetProperties(call_conf_id)):
- ads[0].log.error(
- "Conf call id % properties wrong: %s", call_conf_id,
- ads[0].droid.telecomCallGetProperties(call_conf_id))
- return None
+ if (CALL_PROPERTY_CONFERENCE not in ads[0]
+ .droid.telecomCallGetProperties(call_conf_id)):
+ ads[0].log.error(
+ "Conf call id % properties wrong: %s", call_conf_id,
+ ads[0].droid.telecomCallGetProperties(call_conf_id))
+ return None
- if (CALL_CAPABILITY_MANAGE_CONFERENCE not in ads[0]
- .droid.telecomCallGetCapabilities(call_conf_id)):
- ads[0].log.error(
- "Conf call id %s capabilities wrong: %s", call_conf_id,
- ads[0].droid.telecomCallGetCapabilities(call_conf_id))
- return None
+ if (CALL_CAPABILITY_MANAGE_CONFERENCE not in ads[0]
+ .droid.telecomCallGetCapabilities(call_conf_id)):
+ ads[0].log.error(
+ "Conf call id %s capabilities wrong: %s", call_conf_id,
+ ads[0].droid.telecomCallGetCapabilities(call_conf_id))
+ return None
- if (call_ab_id in calls) or (call_ac_id in calls):
- self.log.error(
- "Previous call ids should not in new call list after merge.")
- return None
+ if (call_ab_id in calls) or (call_ac_id in calls):
+ self.log.error("Previous call ids should not in new call"
+ " list after merge.")
+ return None
+ else:
+ for call_id in calls:
+ if call_id != call_ab_id and call_id != call_ac_id:
+ call_conf_id = call_id
+ self.log.info("CEP not enabled.")
+ if not call_conf_id:
+ self.log.error("Merge call fail, no new conference call id.")
+ raise signals.TestFailure(
+ "Calls were not merged. Failed to merge calls.",
+ extras={"fail_reason": "Calls were not merged."
+ " Failed to merge calls."})
if not verify_incall_state(self.log, [ads[0], ads[1], ads[2]], True):
- return None
+ return False
# Check if Conf Call is currently active
if ads[0].droid.telecomCallGetCallState(
@@ -1482,7 +1419,7 @@
return call_conf_id
- def _test_ims_conference_merge_drop_second_call_from_participant_cep(
+ def _test_ims_conference_merge_drop_second_call_from_participant(
self, call_ab_id, call_ac_id):
"""Test conference merge and drop in IMS (VoLTE or WiFi Calling) call.
(CEP enabled).
@@ -1503,7 +1440,7 @@
"""
ads = self.android_devices
- call_conf_id = self._merge_cep_conference_call(call_ab_id, call_ac_id)
+ call_conf_id = self._merge_ims_conference_call(call_ab_id, call_ac_id)
if call_conf_id is None:
return False
@@ -1526,7 +1463,7 @@
return False
return True
- def _test_ims_conference_merge_drop_first_call_from_participant_cep(
+ def _test_ims_conference_merge_drop_first_call_from_participant(
self, call_ab_id, call_ac_id):
"""Test conference merge and drop in IMS (VoLTE or WiFi Calling) call.
(CEP enabled).
@@ -1547,7 +1484,7 @@
"""
ads = self.android_devices
- call_conf_id = self._merge_cep_conference_call(call_ab_id, call_ac_id)
+ call_conf_id = self._merge_ims_conference_call(call_ab_id, call_ac_id)
if call_conf_id is None:
return False
@@ -1568,7 +1505,7 @@
return False
return True
- def _test_ims_conference_merge_drop_second_call_from_host_cep(
+ def _test_ims_conference_merge_drop_second_call_from_host(
self, call_ab_id, call_ac_id):
"""Test conference merge and drop in IMS (VoLTE or WiFi Calling) call.
(CEP enabled).
@@ -1592,7 +1529,7 @@
call_ab_uri = get_call_uri(ads[0], call_ab_id)
call_ac_uri = get_call_uri(ads[0], call_ac_id)
- call_conf_id = self._merge_cep_conference_call(call_ab_id, call_ac_id)
+ call_conf_id = self._merge_ims_conference_call(call_ab_id, call_ac_id)
if call_conf_id is None:
return False
@@ -1636,7 +1573,7 @@
return False
return True
- def _test_ims_conference_merge_drop_first_call_from_host_cep(
+ def _test_ims_conference_merge_drop_first_call_from_host(
self, call_ab_id, call_ac_id):
"""Test conference merge and drop in IMS (VoLTE or WiFi Calling) call.
(CEP enabled).
@@ -1660,7 +1597,7 @@
call_ab_uri = get_call_uri(ads[0], call_ab_id)
call_ac_uri = get_call_uri(ads[0], call_ac_id)
- call_conf_id = self._merge_cep_conference_call(call_ab_id, call_ac_id)
+ call_conf_id = self._merge_ims_conference_call(call_ab_id, call_ac_id)
if call_conf_id is None:
return False
@@ -2409,103 +2346,6 @@
return call_ab_id, call_ac_id
- def _test_epdg_conference_merge_drop(self, call_ab_id, call_ac_id):
- """Test conference merge and drop in epdg call.
-
- PhoneA in epdg call with PhoneB.
- PhoneA in epdg call with PhoneC.
- Merge calls to conference on PhoneA.
- Hangup on PhoneC, check call continues between AB.
- Hangup on PhoneB, check A ends.
-
- Args:
- call_ab_id: call id for call_AB on PhoneA.
- call_ac_id: call id for call_AC on PhoneA.
-
- Returns:
- True if succeed;
- False if failed.
- """
- ads = self.android_devices
- self.log.info("Step4: Merge to Conf Call and verify Conf Call.")
- ads[0].droid.telecomCallJoinCallsInConf(call_ab_id, call_ac_id)
- time.sleep(WAIT_TIME_IN_CALL)
- calls = ads[0].droid.telecomCallGetCallIds()
- ads[0].log.info("Calls in PhoneA %s", calls)
-
- call_conf_id = None
- if num_active_calls(self.log, ads[0]) != 1:
- ads[0].log.info("Total number of call ids is not 1.")
- call_conf_id = get_cep_conference_call_id(ads[0])
- if call_conf_id is not None:
- self.log.info("New conference call id is found. CEP enabled.")
-
- calls.remove(call_conf_id)
- if (set(ads[0].droid.telecomCallGetCallChildren(
- call_conf_id)) != set(calls)):
- ads[0].log.error(
- "Children list %s for conference call is not correct.",
- ads[0].droid.telecomCallGetCallChildren(call_conf_id))
- return False
-
- if (CALL_PROPERTY_CONFERENCE not in ads[0]
- .droid.telecomCallGetProperties(call_conf_id)):
- ads[0].log.error(
- "Conf call id % properties wrong: %s", call_conf_id,
- ads[0].droid.telecomCallGetProperties(call_conf_id))
- return False
-
- if (CALL_CAPABILITY_MANAGE_CONFERENCE not in ads[0]
- .droid.telecomCallGetCapabilities(call_conf_id)):
- ads[0].log.error(
- "Conf call id %s capabilities wrong: %s", call_conf_id,
- ads[0].droid.telecomCallGetCapabilities(call_conf_id))
- return False
-
- if (call_ab_id in calls) or (call_ac_id in calls):
- self.log.error(
- "Previous call ids should not in new call list after "
- "merge.")
- return False
- else:
- for call_id in calls:
- if call_id != call_ab_id and call_id != call_ac_id:
- call_conf_id = call_id
- self.log.info("CEP not enabled.")
-
- if not call_conf_id:
- self.log.error("Merge call fail, no new conference call id.")
- return False
- if not verify_incall_state(self.log, [ads[0], ads[1], ads[2]], True):
- return False
-
- # Check if Conf Call is currently active
- if ads[0].droid.telecomCallGetCallState(
- call_conf_id) != CALL_STATE_ACTIVE:
- ads[0].log.error(
- "Call_id: %s, state: %s, expected: STATE_ACTIVE", call_conf_id,
- ads[0].droid.telecomCallGetCallState(call_conf_id))
- return False
-
- self.log.info("Step5: End call on PhoneC and verify call continues.")
- if not self._hangup_call(ads[2], "PhoneC"):
- return False
- time.sleep(WAIT_TIME_IN_CALL)
- calls = ads[0].droid.telecomCallGetCallIds()
- ads[0].log.info("Calls in PhoneA %s", calls)
- if not verify_incall_state(self.log, [ads[0], ads[1]], True):
- return False
- if not verify_incall_state(self.log, [ads[2]], False):
- return False
-
- self.log.info("Step6: End call on PhoneB and verify PhoneA end.")
- if not self._hangup_call(ads[1], "PhoneB"):
- return False
- time.sleep(WAIT_TIME_IN_CALL)
- if not verify_incall_state(self.log, [ads[0], ads[1], ads[2]], False):
- return False
- return True
-
""" Tests Begin """
@TelephonyBaseTest.tel_test_wrap
@@ -3338,7 +3178,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3360,7 +3200,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3381,7 +3221,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3403,7 +3243,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3424,7 +3264,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3446,7 +3286,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3468,7 +3308,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3489,7 +3329,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3511,7 +3351,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3532,7 +3372,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3554,7 +3394,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3576,7 +3416,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3597,7 +3437,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3619,7 +3459,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3640,7 +3480,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3662,7 +3502,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3684,7 +3524,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3705,7 +3545,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3727,7 +3567,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3748,7 +3588,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3770,7 +3610,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3792,7 +3632,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3813,7 +3653,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3835,7 +3675,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3856,7 +3696,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3878,7 +3718,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3900,7 +3740,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3921,7 +3761,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3943,7 +3783,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3964,7 +3804,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -3986,7 +3826,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -4008,7 +3848,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -4029,7 +3869,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -4051,7 +3891,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -4072,7 +3912,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -4094,7 +3934,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -4116,7 +3956,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -4137,7 +3977,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -4159,7 +3999,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -4180,7 +4020,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -4202,7 +4042,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -4224,7 +4064,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -4245,7 +4085,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -4267,7 +4107,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -4288,7 +4128,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -4899,7 +4739,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -4922,7 +4762,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -4945,7 +4785,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -4968,7 +4808,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -4991,7 +4831,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5015,7 +4855,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5039,7 +4879,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5063,7 +4903,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5087,7 +4927,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5111,7 +4951,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5134,7 +4974,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5157,7 +4997,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5180,7 +5020,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5203,7 +5043,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5226,7 +5066,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5250,7 +5090,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5274,7 +5114,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5298,7 +5138,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5322,7 +5162,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5346,7 +5186,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5369,7 +5209,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5392,7 +5232,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5415,7 +5255,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5438,7 +5278,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5461,7 +5301,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5485,7 +5325,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5509,7 +5349,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5533,7 +5373,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5557,7 +5397,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5581,7 +5421,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5604,7 +5444,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5627,7 +5467,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5650,7 +5490,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5673,7 +5513,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5696,7 +5536,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5720,7 +5560,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5744,7 +5584,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5768,7 +5608,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5792,7 +5632,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5816,7 +5656,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5839,7 +5679,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5862,7 +5702,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5885,7 +5725,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5908,7 +5748,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5931,7 +5771,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5955,7 +5795,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -5979,7 +5819,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6003,7 +5843,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6027,7 +5867,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6051,7 +5891,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6074,7 +5914,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6097,7 +5937,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6120,7 +5960,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6143,7 +5983,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6166,7 +6006,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6190,7 +6030,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6214,7 +6054,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6238,7 +6078,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6262,7 +6102,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6286,7 +6126,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6309,7 +6149,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6332,7 +6172,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6355,7 +6195,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6378,7 +6218,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6401,7 +6241,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6425,7 +6265,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6449,7 +6289,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6473,7 +6313,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6497,7 +6337,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6521,7 +6361,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6544,7 +6384,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6567,7 +6407,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6590,7 +6430,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6613,7 +6453,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6636,7 +6476,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6660,7 +6500,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6684,7 +6524,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6708,7 +6548,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6732,7 +6572,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6756,7 +6596,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6779,7 +6619,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6802,7 +6642,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6825,7 +6665,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6848,7 +6688,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6871,7 +6711,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6895,7 +6735,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6919,7 +6759,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6943,7 +6783,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6967,7 +6807,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -6991,7 +6831,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -7318,7 +7158,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="89b9f228-97a6-4e5c-96b9-a7f87d847c22")
@@ -7353,7 +7193,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="2c6dc281-59b0-4ea4-b811-e4c3a4d654ab")
@@ -7388,7 +7229,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="f6727241-b727-4eb8-8c0d-f61d3a14a635")
@@ -7423,7 +7265,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="c9e54db0-2b0b-428b-ba63-619ad0b8637b")
@@ -7458,7 +7301,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="a478cc82-d95c-43fc-9735-d8333b8937e2")
@@ -7493,7 +7337,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="b1acb263-1481-44a5-b18e-58bdeff7bc1e")
@@ -7524,7 +7369,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="03b8a0d2-80dd-465a-ad14-5db94cdbcc53")
@@ -7555,7 +7401,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="9eb1a816-1e2c-41da-b083-2026163a3893")
@@ -7586,7 +7433,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="3d66a1b6-916f-4221-bd99-21ff4d40ebb8")
@@ -7617,7 +7465,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="9d8e8b2f-e2b9-4607-8c54-6233b3096123")
@@ -7648,7 +7497,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="0884206b-2471-4a7e-95aa-228379416ff8")
@@ -7679,7 +7529,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="c7706af6-dc77-4002-b295-66c60aeace6b")
@@ -7710,7 +7561,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="b079618f-e32b-4ba0-9009-06e013805c39")
@@ -7741,7 +7593,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="571fe98b-354f-4038-8441-0e4b1840eb7a")
@@ -7772,7 +7625,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="8f531f3c-493e-43d6-9d6d-f4990b5feba4")
@@ -7803,7 +7657,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="00e1194b-3c06-46c4-8764-0339c0aa9f9e")
@@ -7834,7 +7689,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="c94f6444-d265-4277-9555-57041e3c4ff4")
@@ -7865,7 +7721,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="0980745e-dcdc-4c56-84e3-e2ee076059ee")
@@ -7899,7 +7756,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="6bf0b152-fb1c-4edc-9525-b39e8640b967")
@@ -7933,7 +7791,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="e3013df6-98ca-4318-85ba-04011ba0a24f")
@@ -7968,7 +7827,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="e88bf042-8799-44c7-bc50-66ac1e1fb2ac")
@@ -8004,7 +7864,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="a8302e73-82a4-4409-b038-5c604fb4c66c")
@@ -8038,7 +7899,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="80f69baf-1649-4858-b35c-b25baf79b42c")
@@ -8072,7 +7934,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="1ac0c067-49fb-41d9-8649-cc709bdd8926")
@@ -8107,7 +7970,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="b20b1a94-048c-4f10-9261-dde79e1edb00")
@@ -8143,7 +8007,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="402b175f-1510-4e2a-97c2-7c9ea5ce40f6")
@@ -8173,7 +8038,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="7c710fbf-4b77-4b46-9719-e17b3d047cfc")
@@ -8204,7 +8070,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="642afbac-30c1-4dbf-bf3e-758ab6c3a306")
@@ -8235,7 +8102,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="a4ae1e39-ed6d-412e-b821-321c715a5d47")
@@ -8267,7 +8135,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="7b8431f2-8a49-4aa9-b84d-77f16a6a2c30")
@@ -8297,7 +8166,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="5b4d7444-32a1-4e82-8847-1c4ae002edca")
@@ -8328,7 +8198,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="88c6c179-0b56-4d03-b5e4-76a147a40995")
@@ -8359,7 +8230,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="7f744ab3-f919-4a7a-83ce-e38487d619cc")
@@ -8391,7 +8263,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="5c861a99-a1b8-45fc-ba67-f8fde4575efc")
@@ -8421,7 +8294,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="fdb32a13-302c-4c1c-a77e-f78ed7e90911")
@@ -8452,7 +8326,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="a2cf3366-ae66-4e8f-a682-df506173f282")
@@ -8483,7 +8358,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="fc5f0f1c-9610-4d0f-adce-9c8db351e7da")
@@ -8515,7 +8391,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="05332b1e-c36b-4874-b13b-f8e49d0d9bca")
@@ -8545,7 +8422,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="2421d340-f9cb-47e7-ac3e-8581e141a6d0")
@@ -8576,7 +8454,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="7c1f6008-cf59-4e63-9285-3cf1c26bc0aa")
@@ -8607,7 +8486,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="be153f3d-0707-45d0-9ddd-4aa696e0e536")
@@ -8639,7 +8519,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="7235c917-a2d4-4561-bda5-630171053f8f")
@@ -8669,7 +8550,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="8e52b9a4-c0d1-4dcd-9359-746354124763")
@@ -8699,7 +8581,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="49a4440f-40a1-4518-810a-6ba9f1fbc243")
@@ -8730,7 +8613,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="9d05bde3-50ac-4a49-a0db-2181c9b5a10f")
@@ -8761,7 +8645,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="5c44eb64-b184-417a-97c9-8c22c48fb731")
@@ -8791,7 +8676,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="e16e2e81-1b59-4b02-b601-bb27b62d6468")
@@ -8821,7 +8707,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="fd4c3b72-ea2d-4cd4-af79-b93635eda8b8")
@@ -8852,7 +8739,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="a33d7b2b-cc22-40c3-9689-a2a14642396d")
@@ -8883,7 +8771,8 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_epdg_conference_merge_drop(call_ab_id, call_ac_id)
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
+ call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@test_tracker_info(uuid="7839c6a3-6797-4cd0-a918-c7d317881e3d")
@@ -9900,7 +9789,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -9946,7 +9835,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -9992,7 +9881,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -10038,7 +9927,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -10084,7 +9973,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -10130,7 +10019,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -10176,7 +10065,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -10222,7 +10111,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -10268,7 +10157,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -10314,7 +10203,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -10360,7 +10249,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -10406,7 +10295,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -10452,7 +10341,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -10498,7 +10387,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -10544,7 +10433,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_first_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_first_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -10592,7 +10481,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_no_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -10640,7 +10529,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_host_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_host(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap
@@ -10688,7 +10577,7 @@
if call_ab_id is None or call_ac_id is None:
return False
- return self._test_ims_conference_merge_drop_second_call_from_participant_cep(
+ return self._test_ims_conference_merge_drop_second_call_from_participant(
call_ab_id, call_ac_id)
@TelephonyBaseTest.tel_test_wrap