From 1e19151867cc2d93d8fc2852c62a3fc551022381 Mon Sep 17 00:00:00 2001
From: Pau Espin Pedrol <pespin@sysmocom.de>
Date: Mon, 11 Dec 2017 15:12:55 +0100
Subject: suites: Wait for BTS to connect to BSC before continuing

Change-Id: I027e3bfb8f470a811e65e718e2a8c46809fe6396
---
 suites/aoip_debug/interactive.py                | 2 ++
 suites/aoip_encryption/register_a5_0_authopt.py | 1 +
 suites/aoip_encryption/register_a5_0_authreq.py | 1 +
 suites/aoip_encryption/register_a5_1_authreq.py | 1 +
 suites/aoip_smpp/esme_ms_sms_storeforward.py    | 1 +
 suites/aoip_smpp/esme_ms_sms_transaction.py     | 1 +
 suites/aoip_sms/mo_mt_sms.py                    | 1 +
 suites/aoip_ussd/assert_extension.py            | 1 +
 suites/debug/interactive.py                     | 1 +
 suites/gprs/ping.py                             | 1 +
 suites/netreg/register.py                       | 1 +
 suites/netreg/register_default.py               | 1 +
 suites/smpp/esme_ms_sms_storeforward.py         | 1 +
 suites/smpp/esme_ms_sms_transaction.py          | 1 +
 suites/sms/mo_mt_sms.py                         | 1 +
 suites/ussd/assert_extension.py                 | 1 +
 suites/voice/mo_mt_call.py                      | 1 +
 17 files changed, 18 insertions(+)

(limited to 'suites')

diff --git a/suites/aoip_debug/interactive.py b/suites/aoip_debug/interactive.py
index 312083a..b08bac1 100755
--- a/suites/aoip_debug/interactive.py
+++ b/suites/aoip_debug/interactive.py
@@ -26,6 +26,8 @@ mgw_bsc.start()
 bsc.start()
 
 bts.start()
+print('Waiting for bts to connect to bsc...')
+wait(bsc.bts_is_connected, bts)
 print('Waiting for bts to be ready...')
 wait(bts.ready_for_pcu)
 pcu.start()
diff --git a/suites/aoip_encryption/register_a5_0_authopt.py b/suites/aoip_encryption/register_a5_0_authopt.py
index 75614e2..6a06078 100755
--- a/suites/aoip_encryption/register_a5_0_authopt.py
+++ b/suites/aoip_encryption/register_a5_0_authopt.py
@@ -22,6 +22,7 @@ mgw_bsc.start()
 bsc.bts_add(bts)
 bsc.start()
 bts.start()
+wait(bsc.bts_is_connected, bts)
 
 ms.log_info()
 good_ki = ms.ki()
diff --git a/suites/aoip_encryption/register_a5_0_authreq.py b/suites/aoip_encryption/register_a5_0_authreq.py
index 07293d2..d6c67ea 100755
--- a/suites/aoip_encryption/register_a5_0_authreq.py
+++ b/suites/aoip_encryption/register_a5_0_authreq.py
@@ -22,6 +22,7 @@ mgw_bsc.start()
 bsc.bts_add(bts)
 bsc.start()
 bts.start()
+wait(bsc.bts_is_connected, bts)
 
 ms.log_info()
 good_ki = ms.ki()
diff --git a/suites/aoip_encryption/register_a5_1_authreq.py b/suites/aoip_encryption/register_a5_1_authreq.py
index 190e5bb..b2c446f 100755
--- a/suites/aoip_encryption/register_a5_1_authreq.py
+++ b/suites/aoip_encryption/register_a5_1_authreq.py
@@ -22,6 +22,7 @@ mgw_bsc.start()
 bsc.bts_add(bts)
 bsc.start()
 bts.start()
+wait(bsc.bts_is_connected, bts)
 
 ms.log_info()
 good_ki = ms.ki()
diff --git a/suites/aoip_smpp/esme_ms_sms_storeforward.py b/suites/aoip_smpp/esme_ms_sms_storeforward.py
index 79c570e..9effe6d 100755
--- a/suites/aoip_smpp/esme_ms_sms_storeforward.py
+++ b/suites/aoip_smpp/esme_ms_sms_storeforward.py
@@ -32,6 +32,7 @@ mgcpgw.start()
 mgw_bsc.start()
 bsc.start()
 bts.start()
+wait(bsc.bts_is_connected, bts)
 
 esme.connect()
 hlr.subscriber_add(ms)
diff --git a/suites/aoip_smpp/esme_ms_sms_transaction.py b/suites/aoip_smpp/esme_ms_sms_transaction.py
index e20b2b6..190879d 100755
--- a/suites/aoip_smpp/esme_ms_sms_transaction.py
+++ b/suites/aoip_smpp/esme_ms_sms_transaction.py
@@ -30,6 +30,7 @@ mgcpgw.start()
 mgw_bsc.start()
 bsc.start()
 bts.start()
+wait(bsc.bts_is_connected, bts)
 
 esme.connect()
 hlr.subscriber_add(ms)
diff --git a/suites/aoip_sms/mo_mt_sms.py b/suites/aoip_sms/mo_mt_sms.py
index 76b7e51..6ce460f 100755
--- a/suites/aoip_sms/mo_mt_sms.py
+++ b/suites/aoip_sms/mo_mt_sms.py
@@ -21,6 +21,7 @@ bsc.bts_add(bts)
 bsc.start()
 
 bts.start()
+wait(bsc.bts_is_connected, bts)
 
 hlr.subscriber_add(ms_mo)
 hlr.subscriber_add(ms_mt)
diff --git a/suites/aoip_ussd/assert_extension.py b/suites/aoip_ussd/assert_extension.py
index 181f07f..5969b01 100755
--- a/suites/aoip_ussd/assert_extension.py
+++ b/suites/aoip_ussd/assert_extension.py
@@ -22,6 +22,7 @@ bsc.bts_add(bts)
 bsc.start()
 
 bts.start()
+wait(bsc.bts_is_connected, bts)
 
 hlr.subscriber_add(ms)
 
diff --git a/suites/debug/interactive.py b/suites/debug/interactive.py
index 6df5b6d..595cfd9 100755
--- a/suites/debug/interactive.py
+++ b/suites/debug/interactive.py
@@ -10,6 +10,7 @@ print('start nitb and bts...')
 nitb.bts_add(bts)
 nitb.start()
 bts.start()
+wait(nitb.bts_is_connected, bts)
 
 for m in modems:
   nitb.subscriber_add(m)
diff --git a/suites/gprs/ping.py b/suites/gprs/ping.py
index f6f01a6..1b6d85c 100755
--- a/suites/gprs/ping.py
+++ b/suites/gprs/ping.py
@@ -27,6 +27,7 @@ mgw_bsc.start()
 bsc.start()
 
 bts.start()
+wait(bsc.bts_is_connected, bts)
 print('Waiting for bts to be ready...')
 wait(bts.ready_for_pcu)
 pcu.start()
diff --git a/suites/netreg/register.py b/suites/netreg/register.py
index 9807d2b..d5fbeb7 100755
--- a/suites/netreg/register.py
+++ b/suites/netreg/register.py
@@ -10,6 +10,7 @@ print('start nitb and bts...')
 nitb.bts_add(bts)
 nitb.start()
 bts.start()
+wait(nitb.bts_is_connected, bts)
 
 nitb.subscriber_add(ms)
 
diff --git a/suites/netreg/register_default.py b/suites/netreg/register_default.py
index 797b2c1..545525d 100755
--- a/suites/netreg/register_default.py
+++ b/suites/netreg/register_default.py
@@ -10,6 +10,7 @@ print('start nitb and bts...')
 nitb.bts_add(bts)
 nitb.start()
 bts.start()
+wait(nitb.bts_is_connected, bts)
 
 nitb.subscriber_add(ms)
 
diff --git a/suites/smpp/esme_ms_sms_storeforward.py b/suites/smpp/esme_ms_sms_storeforward.py
index c35e3b1..391a040 100755
--- a/suites/smpp/esme_ms_sms_storeforward.py
+++ b/suites/smpp/esme_ms_sms_storeforward.py
@@ -22,6 +22,7 @@ nitb.bts_add(bts)
 nitb.smsc.esme_add(esme)
 nitb.start()
 bts.start()
+wait(nitb.bts_is_connected, bts)
 
 esme.connect()
 nitb.subscriber_add(ms)
diff --git a/suites/smpp/esme_ms_sms_transaction.py b/suites/smpp/esme_ms_sms_transaction.py
index efc244c..adc9dae 100755
--- a/suites/smpp/esme_ms_sms_transaction.py
+++ b/suites/smpp/esme_ms_sms_transaction.py
@@ -20,6 +20,7 @@ nitb.bts_add(bts)
 nitb.smsc.esme_add(esme)
 nitb.start()
 bts.start()
+wait(nitb.bts_is_connected, bts)
 
 esme.connect()
 nitb.subscriber_add(ms)
diff --git a/suites/sms/mo_mt_sms.py b/suites/sms/mo_mt_sms.py
index f729f99..10897ff 100755
--- a/suites/sms/mo_mt_sms.py
+++ b/suites/sms/mo_mt_sms.py
@@ -10,6 +10,7 @@ print('start nitb and bts...')
 nitb.bts_add(bts)
 nitb.start()
 bts.start()
+wait(nitb.bts_is_connected, bts)
 
 nitb.subscriber_add(ms_mo)
 nitb.subscriber_add(ms_mt)
diff --git a/suites/ussd/assert_extension.py b/suites/ussd/assert_extension.py
index 77e5423..8ccab2d 100755
--- a/suites/ussd/assert_extension.py
+++ b/suites/ussd/assert_extension.py
@@ -11,6 +11,7 @@ print('start nitb and bts...')
 nitb.bts_add(bts)
 nitb.start()
 bts.start()
+wait(nitb.bts_is_connected, bts)
 
 nitb.subscriber_add(ms)
 
diff --git a/suites/voice/mo_mt_call.py b/suites/voice/mo_mt_call.py
index 46c5ec8..fa3b900 100755
--- a/suites/voice/mo_mt_call.py
+++ b/suites/voice/mo_mt_call.py
@@ -21,6 +21,7 @@ bsc.bts_add(bts)
 bsc.start()
 
 bts.start()
+wait(bsc.bts_is_connected, bts)
 
 hlr.subscriber_add(ms_mo)
 hlr.subscriber_add(ms_mt)
-- 
cgit v1.2.3