fr: Add component id in logs; add 15s timeout waiting for BVC-UNBLOCK

Change-Id: If62d54517ee9af828d6fa56d83073260ceced1e8
diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn
index 23c8e26..2bac1f8 100644
--- a/fr/FR_Tests.ttcn
+++ b/fr/FR_Tests.ttcn
@@ -115,19 +115,28 @@
 
 function f_ul_ud(charstring id) runs on UE_CT {
 
-	log("Waiting for BVC-UNBLOCK");
+	log(id, " Waiting for BVC-UNBLOCK");
+	timer T := 15.0;
+	T.start;
 	alt {
 	[] BSSGP[0].receive(BssgpStatusIndication:{*,?,BVC_S_UNBLOCKED}) { }
 	[] BSSGP[0].receive { repeat; }
+	[] T.timeout {
+		setverdict(fail, id, " Timeout waiting for BVC-UNBLOCK");
+		self.stop;
+		}
 	}
 
-	log ("Entering main loop");
+	log (id, " Entering main loop");
 	for (var integer num_pkts := 0; num_pkts < 50; num_pkts := num_pkts + 1) {
 		var integer ran_index := 0;
 		//BSSGP[ran_index].send(ts_BSSGP_UL_UD(g_pars.tlli, g_pars.bssgp_cell_id[ran_index], llc_enc));
 		BSSGP[ran_index].send(ts_LLC_UI(f_rnd_octstring(512), '0000'B, '1'B, 0))
 		f_sleep(0.5);
+		/* 512 bytes + 32 bytes HDR every 0.5s (1088/s) means about 8704/s per UE */
+		/* at 100 UE that ends up about 870 kBps */
 	}
+	log (id, "Leaving main loop");
 }
 
 function f_start_ue(void_fn fn, charstring id, GbInstance gb, integer imsi_suffix, BSSGP_BVC_CT bvc_comp, float t_guard := 40.0)