[L] Change in osmo-ttcn3-hacks[master]: DIAMETER: Get Rid of DIAMETER_ConnHdlr_CT in several testsuites - gerrit-log

19 Aug 2026

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43284?usp=email )
Change subject: DIAMETER: Get Rid of DIAMETER_ConnHdlr_CT in several testsuites
......................................................................
DIAMETER: Get Rid of DIAMETER_ConnHdlr_CT in several testsuites
A man-in-the-middle component DIAMETER_ConnHdlr_CT was used so far
for tests willing to use multiple DIAMETER_ConnHdlr connected to a
single component served by multiple DIAMETER_Emulation.
Remove the need for this component by modifying the DIAMETER_ConnHdlr
component to have an array of ports. This way the same ConnHdlr can be
registered on multiple DIAMETER_Emulation components directly.
Change-Id: Id88b88d2f3472e1f4daa8344ca1fc6d408edfb62
---
M dia2gsup/DIA2GSUP_Tests.ttcn
M epdg/EPDG_Tests.ttcn
M hss/HSS_Tests.ttcn
M library/DIAMETER_Emulation.ttcn
M mme/ConnHdlr.ttcn
M mme/MME_Tests.ttcn
M pcrf/PCRF_Tests.ttcn
M pgw/PGW_Tests.ttcn
8 files changed, 153 insertions(+), 304 deletions(-)
Approvals:
  pespin: Looks good to me, approved
  Jenkins Builder: Verified
  osmith: Looks good to me, but someone else must approve
  laforge: Looks good to me, but someone else must approve

diff --git a/dia2gsup/DIA2GSUP_Tests.ttcn b/dia2gsup/DIA2GSUP_Tests.ttcn
index 6d1828f..9522b65 100644
--- a/dia2gsup/DIA2GSUP_Tests.ttcn
+++ b/dia2gsup/DIA2GSUP_Tests.ttcn
@@ -118,8 +118,8 @@
    connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT);
    connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC);
-	connect(vc_conn:DIAMETER, vc_DIAMETER:DIAMETER_CLIENT);
-	connect(vc_conn:DIAMETER_PROC, vc_DIAMETER:DIAMETER_PROC);
+	connect(vc_conn:DIAMETER[0], vc_DIAMETER:DIAMETER_CLIENT);
+	connect(vc_conn:DIAMETER_PROC[0], vc_DIAMETER:DIAMETER_PROC);
DIAMETER_UNIT.receive(DiameterCapabilityExchgInd:?);
@@ -181,7 +181,7 @@
    f_diameter_expect_eteid(ete_id);
/* Send AIR to translator; expect it to show up on GSUP side */
-	DIAMETER.send(ts_DIA_AIR(g_pars.imsi, vplmn, sess_id, hbh_id := hbh_id, ete_id := ete_id));
+	DIAMETER[0].send(ts_DIA_AIR(g_pars.imsi, vplmn, sess_id, hbh_id := hbh_id, ete_id := ete_id));
    GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi));
/* Send a positive response back to the translator; expect AIA */
@@ -196,10 +196,10 @@
alt {
    /* Unlike AIR, AIA contains no IMSI, hence it is received in DIAMETER_UNIT: */
-	[] DIAMETER.receive(tr_DIA_AIA) {
+	[] DIAMETER[0].receive(tr_DIA_AIA) {
    	setverdict(pass);
    	}
-	[] DIAMETER.receive(PDU_DIAMETER:?) -> value rx_dia {
+	[] DIAMETER[0].receive(PDU_DIAMETER:?) -> value rx_dia {
    	Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter msg rx: ", rx_dia));
    	}
    }
@@ -231,7 +231,7 @@
    f_diameter_expect_eteid(ete_id);
/* Send AIR to translator; expect it to show up on GSUP side */
-	DIAMETER.send(ts_DIA_AIR(g_pars.imsi, vplmn, sess_id, hbh_id := hbh_id, ete_id := ete_id));
+	DIAMETER[0].send(ts_DIA_AIR(g_pars.imsi, vplmn, sess_id, hbh_id := hbh_id, ete_id := ete_id));
    GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi));
/* Send an error response back to the translator; expect AIA */
@@ -239,10 +239,10 @@
alt {
    /* Unlike AIR, AIA contains no IMSI, hence it is received in DIAMETER_UNIT: */
-	[] DIAMETER.receive(tr_DIA_AIA_ERR(err_avp)) {
+	[] DIAMETER[0].receive(tr_DIA_AIA_ERR(err_avp)) {
    	setverdict(pass);
    	}
-	[] DIAMETER.receive(PDU_DIAMETER:?) -> value rx_dia {
+	[] DIAMETER[0].receive(PDU_DIAMETER:?) -> value rx_dia {
    	Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter msg rx: ", rx_dia));
    	}
    }
diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn
index e4aed42..0127988 100644
--- a/epdg/EPDG_Tests.ttcn
+++ b/epdg/EPDG_Tests.ttcn
@@ -68,6 +68,9 @@
    integer mp_diam_watchdog_initial_wait_sec := 6*3;
 }
+const integer DIA_SWx := 0;
+const integer DIA_S6b := 1;
+
 type port Coord_PT message
 {
    inout charstring;
@@ -107,43 +110,8 @@
    }
 }
-type component DIAMETER_ConnHdlr_CT extends DIAMETER_ConnHdlr {
-	port DIAMETER_Conn_PT DIAMETER_CLIENT;
-	port DIAMETEREM_PROC_PT DIAMETER_PROC_CLIENT;
-}
-
-function f_diam_connhldr_ct_main(hexstring imsi) runs on DIAMETER_ConnHdlr_CT {
-	var DIAMETER_ConnHdlr vc_conn_unused;
-	var PDU_DIAMETER msg;
-	var UINT32 ete_id;
-
-	f_diameter_expect_imsi(imsi);
-
-	while (true) {
-		alt {
-		[] DIAMETER_CLIENT.receive(PDU_DIAMETER:?) -> value msg {
-			DIAMETER.send(msg);
-			}
-		[] DIAMETER.receive(PDU_DIAMETER:?) -> value msg {
-			DIAMETER_CLIENT.send(msg);
-			}
-		[] DIAMETER_PROC_CLIENT.getcall(DIAMETEREM_register_eteid:{?,?}) -> param(ete_id, vc_conn_unused) {
-			DIAMETER_PROC.call(DIAMETEREM_register_eteid:{ete_id, self}) {
-				[] DIAMETER_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {};
-				}
-			DIAMETER_PROC_CLIENT.reply(DIAMETEREM_register_eteid:{ete_id, vc_conn_unused});
-			}
-		}
-	}
-}
-
 type component EPDG_ConnHdlr extends DIAMETER_ConnHdlr, GSUP_ConnHdlr, GTP2_ConnHdlr, GTP1U_ConnHdlr {
    var EPDG_ConnHdlrPars g_pars;
-
-	port DIAMETER_Conn_PT SWx;
-	port DIAMETEREM_PROC_PT SWx_PROC;
-	port DIAMETER_Conn_PT S6b;
-	port DIAMETEREM_PROC_PT S6b_PROC;
    port Coord_PT COORD;
 };
 type record of EPDG_ConnHdlr EPDG_ConnHdlrList;
@@ -174,17 +142,6 @@
    AuthVector vec optional
 };
-private function f_epdg_connhldr_SWx_expect_eteid(UINT32 ete_id) runs on EPDG_ConnHdlr {
-	SWx_PROC.call(DIAMETEREM_register_eteid:{ete_id, null}) {
-		[] SWx_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {};
-	}
-}
-private function f_epdg_connhldr_S6b_expect_eteid(UINT32 ete_id) runs on EPDG_ConnHdlr {
-	S6b_PROC.call(DIAMETEREM_register_eteid:{ete_id, null}) {
-		[] S6b_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {};
-	}
-}
-
 private function f_gen_addr_in_pool(integer idx := 0) return charstring
 {
    /* Skip first 2 addresses reserved for TUN */
@@ -346,6 +303,10 @@
 private function f_init_handler(void_fn fn, charstring id, EPDG_ConnHdlrPars pars) runs on EPDG_ConnHdlr {
    g_pars := pars;
+
+	f_diameter_expect_imsi(g_pars.imsi, idx := DIA_SWx);
+	f_diameter_expect_imsi(g_pars.imsi, idx := DIA_S6b);
+
    /* tell GSUP dispatcher to send this IMSI to us */
    f_create_gsup_expect(hex2str(g_pars.imsi));
@@ -359,7 +320,6 @@
 runs on MTC_CT return EPDG_ConnHdlr {
    var EPDG_ConnHdlr vc_conn;
    var charstring id := testcasename();
-	var DIAMETER_ConnHdlr_CT vc_conn_swx, vc_conn_s6b;
vc_conn := EPDG_ConnHdlr.create(id);
@@ -375,20 +335,12 @@
    connect(vc_conn:GTP1U_PROC[0], vc_GTP1U:CLIENT_PROC);
/* SWx */
-	vc_conn_swx := DIAMETER_ConnHdlr_CT.create(id);
-	connect(vc_conn_swx:DIAMETER, vc_SWx:DIAMETER_CLIENT);
-	connect(vc_conn_swx:DIAMETER_PROC, vc_SWx:DIAMETER_PROC);
-	connect(vc_conn:SWx, vc_conn_swx:DIAMETER_CLIENT);
-	connect(vc_conn:SWx_PROC, vc_conn_swx:DIAMETER_PROC_CLIENT);
-	vc_conn_swx.start(f_diam_connhldr_ct_main(pars.imsi));
+	connect(vc_conn:DIAMETER[DIA_SWx], vc_SWx:DIAMETER_CLIENT);
+	connect(vc_conn:DIAMETER_PROC[DIA_SWx], vc_SWx:DIAMETER_PROC);
/* S6b */
-	vc_conn_s6b := DIAMETER_ConnHdlr_CT.create(id);
-	connect(vc_conn_s6b:DIAMETER, vc_S6b:DIAMETER_CLIENT);
-	connect(vc_conn_s6b:DIAMETER_PROC, vc_S6b:DIAMETER_PROC);
-	connect(vc_conn:S6b, vc_conn_s6b:DIAMETER_CLIENT);
-	connect(vc_conn:S6b_PROC, vc_conn_s6b:DIAMETER_PROC_CLIENT);
-	vc_conn_s6b.start(f_diam_connhldr_ct_main(pars.imsi));
+	connect(vc_conn:DIAMETER[DIA_S6b], vc_S6b:DIAMETER_CLIENT);
+	connect(vc_conn:DIAMETER_PROC[DIA_S6b], vc_S6b:DIAMETER_PROC);
/* COORD */
    connect(vc_conn:COORD, self:COORD);
@@ -415,7 +367,7 @@
    						  g_pars.vec.autn,
    						  g_pars.vec.auts);
    /* Send MAA to translator; expect it to show up on GSUP side */
-	SWx.send(ts_DIA_SWx_MAA(g_pars.imsi, sip_auth_data_item,
+	DIAMETER[DIA_SWx].send(ts_DIA_SWx_MAA(g_pars.imsi, sip_auth_data_item,
    			sess_id := sess_id,
    			hbh_id := rx_mar.hop_by_hop_id,
    			ete_id := rx_mar.end_to_end_id));
@@ -434,7 +386,7 @@
    						  g_pars.vec.ck,
    						  g_pars.vec.autn,
    						  g_pars.vec.auts);
-	SWx.send(ts_DIA_SWx_MAA_result(g_pars.imsi, result,
+	DIAMETER[DIA_SWx].send(ts_DIA_SWx_MAA_result(g_pars.imsi, result,
    			       sess_id := sess_id,
    			       hbh_id := rx_mar.hop_by_hop_id,
    			       ete_id := rx_mar.end_to_end_id));
@@ -443,7 +395,7 @@
 /* Diameter SWx MAR + MAA. */
 private altstep as_DIA_SWx_MA_success(boolean exp_req_resync := false) runs on EPDG_ConnHdlr {
    var PDU_DIAMETER rx_dia;
-	[] SWx.receive(tr_DIA_SWx_MAR(g_pars.imsi)) -> value rx_dia {
+	[] DIAMETER[DIA_SWx].receive(tr_DIA_SWx_MAR(g_pars.imsi)) -> value rx_dia {
    	if (exp_req_resync) {
    		var octetstring rand_autn_concatenated := g_pars.vec.rand & g_pars.vec.auts;
    		var AVP avp_grp;
@@ -462,7 +414,7 @@
    	f_DIA_SWx_tx_MAA_success(rx_dia);
    	setverdict(pass);
    }
-	[] SWx.receive(PDU_DIAMETER:?) -> value rx_dia {
+	[] DIAMETER[DIA_SWx].receive(PDU_DIAMETER:?) -> value rx_dia {
    	Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter msg rx: ", rx_dia));
    }
 }
@@ -472,11 +424,11 @@
    var PDU_DIAMETER rx_dia;
    var template (omit) AVP avp;
    var octetstring sess_id;
-	[] SWx.receive(tr_DIA_SWx_SAR(g_pars.imsi)) -> value rx_dia {
+	[] DIAMETER[DIA_SWx].receive(tr_DIA_SWx_SAR(g_pars.imsi)) -> value rx_dia {
    	avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id);
    	sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id);
    	/* Send SAA to translator; expect it to show up on GSUP side */
-		SWx.send(ts_DIA_SWx_SAA(g_pars.imsi,
+		DIAMETER[DIA_SWx].send(ts_DIA_SWx_SAA(g_pars.imsi,
    				IPv4,
    				g_pars.apn,
    				sess_id := sess_id,
@@ -484,7 +436,7 @@
    				ete_id := rx_dia.end_to_end_id));
    	setverdict(pass);
    }
-	[] SWx.receive(PDU_DIAMETER:?) -> value rx_dia {
+	[] DIAMETER[DIA_SWx].receive(PDU_DIAMETER:?) -> value rx_dia {
    	Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter msg rx: ", rx_dia));
    }
 }
@@ -500,9 +452,9 @@
    /* Unlike PPR, PPA contains no IMSI. Register ete_id in DIAMETER_Emulation,
     * so PPA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT.
     */
-	f_epdg_connhldr_SWx_expect_eteid(ete_id);
+	f_diameter_expect_eteid(ete_id, idx := DIA_SWx);
-	SWx.send(ts_DIA_SWx_PPR(g_pars.imsi,
+	DIAMETER[DIA_SWx].send(ts_DIA_SWx_PPR(g_pars.imsi,
    			IPv4,
    			g_pars.apn,
    			hbh_id := hbh_id,
@@ -527,8 +479,8 @@
    }
alt {
-	[] SWx.receive(tr_DIA_SWx_PPA(exp_result_tmpl, hbh_id := hbh_id, ete_id := ete_id)) -> value rx_dia {}
-	[] SWx.receive(PDU_DIAMETER:?) -> value rx_dia {
+	[] DIAMETER[DIA_SWx].receive(tr_DIA_SWx_PPA(exp_result_tmpl, hbh_id := hbh_id, ete_id := ete_id)) -> value rx_dia {}
+	[] DIAMETER[DIA_SWx].receive(PDU_DIAMETER:?) -> value rx_dia {
    	Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter SWx msg rx: ", rx_dia));
    	}
    }
@@ -547,9 +499,9 @@
    /* Unlike STR, STA contains no IMSI. Register ete_id in DIAMETER_Emulation,
     * so AIA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT.
     */
-	f_epdg_connhldr_SWx_expect_eteid(ete_id);
+	f_diameter_expect_eteid(ete_id, idx := DIA_SWx);
-	SWx.send(ts_DIA_SWx_RTR(g_pars.imsi, reason_code, reason_info,
+	DIAMETER[DIA_SWx].send(ts_DIA_SWx_RTR(g_pars.imsi, reason_code, reason_info,
    			hbh_id := hbh_id,
    			ete_id := ete_id));
@@ -564,8 +516,8 @@
    }
alt {
-	[] SWx.receive(tr_DIA_SWx_RTA(exp_result_tmpl, hbh_id := hbh_id, ete_id := ete_id)) -> value rx_dia {}
-	[] SWx.receive(PDU_DIAMETER:?) -> value rx_dia {
+	[] DIAMETER[DIA_SWx].receive(tr_DIA_SWx_RTA(exp_result_tmpl, hbh_id := hbh_id, ete_id := ete_id)) -> value rx_dia {}
+	[] DIAMETER[DIA_SWx].receive(PDU_DIAMETER:?) -> value rx_dia {
    	Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter SWx msg rx: ", rx_dia));
    	}
    }
@@ -584,9 +536,9 @@
    /* Unlike AAR, AAA contains no IMSI. Register ete_id in DIAMETER_Emulation,
     * so AIA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT.
     */
-	f_epdg_connhldr_S6b_expect_eteid(ete_id);
+	f_diameter_expect_eteid(ete_id, idx := DIA_S6b)
-	S6b.send(ts_DIA_S6b_AAR(f_nai(),
+	DIAMETER[DIA_S6b].send(ts_DIA_S6b_AAR(f_nai(),
    			int2oct(DIA_TS29_373_MIP6_Feature_Vector_GTPv2_SUPPORTED, 8),
    			g_pars.apn,
    			pgw_addr,
@@ -598,8 +550,8 @@
    }
alt {
-	[] S6b.receive(tr_DIA_S6b_AAA) -> value rx_dia {}
-	[] S6b.receive(PDU_DIAMETER:?) -> value rx_dia {
+	[] DIAMETER[DIA_S6b].receive(tr_DIA_S6b_AAA) -> value rx_dia {}
+	[] DIAMETER[DIA_S6b].receive(PDU_DIAMETER:?) -> value rx_dia {
    	Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter S6b msg rx: ", rx_dia));
    	}
    }
@@ -614,13 +566,13 @@
    /* Unlike STR, STA contains no IMSI. Register ete_id in DIAMETER_Emulation,
     * so AIA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT.
     */
-	f_epdg_connhldr_S6b_expect_eteid(ete_id);
+	f_diameter_expect_eteid(ete_id, idx := DIA_S6b)
-	S6b.send(ts_DIA_S6b_STR(g_pars.imsi, DIAMETER_LOGOUT,
+	DIAMETER[DIA_S6b].send(ts_DIA_S6b_STR(g_pars.imsi, DIAMETER_LOGOUT,
    			hbh_id := hbh_id, ete_id := ete_id));
    alt {
-	[] S6b.receive(tr_DIA_S6b_STA(DIAMETER_SUCCESS)) -> value rx_dia {}
-	[] S6b.receive(PDU_DIAMETER:?) -> value rx_dia {
+	[] DIAMETER[DIA_S6b].receive(tr_DIA_S6b_STA(DIAMETER_SUCCESS)) -> value rx_dia {}
+	[] DIAMETER[DIA_S6b].receive(PDU_DIAMETER:?) -> value rx_dia {
    	Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter S6b msg rx: ", rx_dia));
    	}
    }
@@ -631,16 +583,16 @@
    var PDU_DIAMETER rx_dia;
    var template (omit) AVP avp;
    var octetstring sess_id;
-	[] S6b.receive(tr_DIA_S6b_RAR(f_nai())) -> value rx_dia {
+	[] DIAMETER[DIA_S6b].receive(tr_DIA_S6b_RAR(f_nai())) -> value rx_dia {
    	avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id);
    	sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id);
-		S6b.send(ts_DIA_S6b_RAA(DIAMETER_SUCCESS,
-					sess_id := sess_id,
-					hbh_id := rx_dia.hop_by_hop_id,
-					ete_id := rx_dia.end_to_end_id));
+		DIAMETER[DIA_S6b].send(ts_DIA_S6b_RAA(DIAMETER_SUCCESS,
+						      sess_id := sess_id,
+						      hbh_id := rx_dia.hop_by_hop_id,
+						      ete_id := rx_dia.end_to_end_id));
    	setverdict(pass);
    }
-	[] S6b.receive(PDU_DIAMETER:?) -> value rx_dia {
+	[] DIAMETER[DIA_S6b].receive(PDU_DIAMETER:?) -> value rx_dia {
    	Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter S6b msg rx: ", rx_dia));
    }
 }
@@ -650,16 +602,16 @@
    var PDU_DIAMETER rx_dia;
    var template (omit) AVP avp;
    var octetstring sess_id;
-	[] S6b.receive(tr_DIA_S6b_ASR(f_nai())) -> value rx_dia {
+	[] DIAMETER[DIA_S6b].receive(tr_DIA_S6b_ASR(f_nai())) -> value rx_dia {
    	avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id);
    	sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id);
-		S6b.send(ts_DIA_S6b_ASA(DIAMETER_SUCCESS,
-					sess_id := sess_id,
-					hbh_id := rx_dia.hop_by_hop_id,
-					ete_id := rx_dia.end_to_end_id));
+		DIAMETER[DIA_S6b].send(ts_DIA_S6b_ASA(DIAMETER_SUCCESS,
+						      sess_id := sess_id,
+						      hbh_id := rx_dia.hop_by_hop_id,
+						      ete_id := rx_dia.end_to_end_id));
    	setverdict(pass);
    }
-	[] S6b.receive(PDU_DIAMETER:?) -> value rx_dia {
+	[] DIAMETER[DIA_S6b].receive(PDU_DIAMETER:?) -> value rx_dia {
    	Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter S6b msg rx: ", rx_dia));
    }
 }
@@ -1096,7 +1048,7 @@
    var DIAMETER_ExperimentalResultcode exp_result_code := DIAMETER_ERROR_USER_UNKNOWN;
    f_GSUP_tx_SAI_REQ();
-	SWx.receive(tr_DIA_SWx_MAR(g_pars.imsi)) -> value rx_dia;
+	DIAMETER[DIA_SWx].receive(tr_DIA_SWx_MAR(g_pars.imsi)) -> value rx_dia;
    f_DIA_SWx_tx_MAA_error(rx_dia,
    		       ts_AVP_ExperimentalResult(vendor_id_3GPP,
    						 int2oct(enum2int(exp_result_code), 4)));
diff --git a/hss/HSS_Tests.ttcn b/hss/HSS_Tests.ttcn
index 1ebb673..7e55968 100644
--- a/hss/HSS_Tests.ttcn
+++ b/hss/HSS_Tests.ttcn
@@ -39,6 +39,8 @@
    HSS_Impl mp_hss_impl := HSS_IMPL_OPEN5GS;
 }
+const integer DIA_S6a := 0;
+
 /* main component, we typically have one per testcase */
 type component MTC_CT {
@@ -58,48 +60,9 @@
    	}
 }
-type component DIAMETER_ConnHdlr_CT extends DIAMETER_ConnHdlr {
-	port DIAMETER_Conn_PT DIAMETER_CLIENT;
-	port DIAMETEREM_PROC_PT DIAMETER_PROC_CLIENT;
-}
-
-function f_diam_connhldr_ct_main(hexstring imsi) runs on DIAMETER_ConnHdlr_CT {
-	var DIAMETER_ConnHdlr vc_conn_unused;
-	var PDU_DIAMETER msg;
-	var UINT32 ete_id;
-
-	f_diameter_expect_imsi(imsi);
-
-	while (true) {
-		alt {
-		[] DIAMETER_CLIENT.receive(PDU_DIAMETER:?) -> value msg {
-			DIAMETER.send(msg);
-			}
-		[] DIAMETER.receive(PDU_DIAMETER:?) -> value msg {
-			DIAMETER_CLIENT.send(msg);
-			}
-		[] DIAMETER_PROC_CLIENT.getcall(DIAMETEREM_register_eteid:{?,?}) -> param(ete_id, vc_conn_unused) {
-			DIAMETER_PROC.call(DIAMETEREM_register_eteid:{ete_id, self}) {
-				[] DIAMETER_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {};
-				}
-			DIAMETER_PROC_CLIENT.reply(DIAMETEREM_register_eteid:{ete_id, vc_conn_unused});
-			}
-		}
-	}
-}
-
 /* per-session component; we typically have 1..N per testcase */
-type component Cli_Session_CT extends Prometheus_Checker_CT {
+type component Cli_Session_CT extends DIAMETER_ConnHdlr, Prometheus_Checker_CT {
    var SessionPars	g_pars;
-
-	port DIAMETER_Conn_PT S6a;
-	port DIAMETEREM_PROC_PT S6a_PROC;
-
-}
-function f_diam_connhldr_expect_eteid(UINT32 ete_id) runs on Cli_Session_CT {
-	S6a_PROC.call(DIAMETEREM_register_eteid:{ete_id, null}) {
-		[] S6a_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {};
-	}
 }
/* configuration data for a given Session */
@@ -167,7 +130,6 @@
 function f_start_handler(void_fn fn, template (omit) SessionPars pars_tmpl := omit)
 runs on MTC_CT return Cli_Session_CT {
    var charstring id := testcasename();
-	var DIAMETER_ConnHdlr_CT vc_conn_s6a;
    var Cli_Session_CT vc_conn;
    var SessionPars pars;
@@ -179,12 +141,8 @@
vc_conn := Cli_Session_CT.create(id);
-	vc_conn_s6a := DIAMETER_ConnHdlr_CT.create(id);
-	connect(vc_conn_s6a:DIAMETER, vc_S6a:DIAMETER_CLIENT);
-	connect(vc_conn_s6a:DIAMETER_PROC, vc_S6a:DIAMETER_PROC);
-	connect(vc_conn:S6a, vc_conn_s6a:DIAMETER_CLIENT);
-	connect(vc_conn:S6a_PROC, vc_conn_s6a:DIAMETER_PROC_CLIENT);
-	vc_conn_s6a.start(f_diam_connhldr_ct_main(pars.imsi));
+	connect(vc_conn:DIAMETER[DIA_S6a], vc_S6a:DIAMETER_CLIENT);
+	connect(vc_conn:DIAMETER_PROC[DIA_S6a], vc_S6a:DIAMETER_PROC);
vc_conn.start(f_handler_init(fn, pars));
    return vc_conn;
@@ -193,6 +151,7 @@
 private function f_handler_init(void_fn fn, SessionPars pars)
 runs on Cli_Session_CT {
    g_pars := valueof(pars);
+	f_diameter_expect_imsi(g_pars.imsi, idx := DIA_S6a);
    f_prometheus_init(mp_hss_prometheus_hostname, mp_hss_prometheus_port);
    fn.apply();
 }
@@ -207,20 +166,20 @@
    /* Unlike ULR, ULA contains no IMSI. Register ete_id in DIAMETER_Emulation,
     * so AIA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT.
     */
-	f_diam_connhldr_expect_eteid(ete_id);
+	f_diameter_expect_eteid(ete_id, idx := DIA_S6a)
/* TODO: change this into a ts_DIA_ULR */
-	S6a.send(ts_DIA_ULR(g_pars.imsi, '111F11'O, sess_id,
-				mp_diam_orig_host, mp_diam_orig_realm,
-				mp_diam_dest_realm, hbh_id, ete_id));
+	DIAMETER[DIA_S6a].send(ts_DIA_ULR(g_pars.imsi, '111F11'O, sess_id,
+					  mp_diam_orig_host, mp_diam_orig_realm,
+					  mp_diam_dest_realm, hbh_id, ete_id));
    g_pars.s6a_next_hbh_id := g_pars.s6a_next_hbh_id + 1;
    g_pars.s6a_next_ete_id := g_pars.s6a_next_ete_id + 1;
alt {
-	[] S6a.receive(tr_DIA_ULA(ula_sub_data, sess_id, ?, ?, hbh_id, ete_id)) -> value rx_dia {
+	[] DIAMETER[DIA_S6a].receive(tr_DIA_ULA(ula_sub_data, sess_id, ?, ?, hbh_id, ete_id)) -> value rx_dia {
    	setverdict(pass);
    	}
-	[] S6a.receive(PDU_DIAMETER:?) -> value rx_dia {
+	[] DIAMETER[DIA_S6a].receive(PDU_DIAMETER:?) -> value rx_dia {
    	Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
    				log2str("Received unexpected DIAMETER ", rx_dia));
    	}
diff --git a/library/DIAMETER_Emulation.ttcn b/library/DIAMETER_Emulation.ttcn
index e5698fd..6e79fd6 100644
--- a/library/DIAMETER_Emulation.ttcn
+++ b/library/DIAMETER_Emulation.ttcn
@@ -49,10 +49,11 @@
    PDU_DIAMETER tx
 };
+const integer DIAMETER_ConnHdlr_MAX_PORTS := 3;
 type component DIAMETER_ConnHdlr {
-	port DIAMETER_Conn_PT DIAMETER;
+	port DIAMETER_Conn_PT DIAMETER[DIAMETER_ConnHdlr_MAX_PORTS];
    /* procedure based port to register for incoming connections */
-	port DIAMETEREM_PROC_PT DIAMETER_PROC;
+	port DIAMETEREM_PROC_PT DIAMETER_PROC[DIAMETER_ConnHdlr_MAX_PORTS];
 }
/* port between individual per-connection components and this dispatcher */
@@ -468,9 +469,9 @@
 signature DIAMETEREM_register_eteid(in UINT32 ete_id, in DIAMETER_ConnHdlr hdlr);
/* client/conn_hdlr side function to use procedure port to create expect in emulation */
-function f_diameter_expect_eteid(UINT32 ete_id) runs on DIAMETER_ConnHdlr {
-	DIAMETER_PROC.call(DIAMETEREM_register_eteid:{ete_id, self}) {
-		[] DIAMETER_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {};
+function f_diameter_expect_eteid(UINT32 ete_id, integer idx := 0) runs on DIAMETER_ConnHdlr {
+	DIAMETER_PROC[idx].call(DIAMETEREM_register_eteid:{ete_id, self}) {
+		[] DIAMETER_PROC[idx].getreply(DIAMETEREM_register_eteid:{?,?}) {};
    }
 }
@@ -529,9 +530,9 @@
 }
/* client/conn_hdlr side function to use procedure port to create expect in emulation */
-function f_diameter_expect_imsi(hexstring imsi) runs on DIAMETER_ConnHdlr {
-	DIAMETER_PROC.call(DIAMETEREM_register_imsi:{imsi, self}) {
-		[] DIAMETER_PROC.getreply(DIAMETEREM_register_imsi:{?,?}) {};
+function f_diameter_expect_imsi(hexstring imsi, integer idx := 0) runs on DIAMETER_ConnHdlr {
+	DIAMETER_PROC[idx].call(DIAMETEREM_register_imsi:{imsi, self}) {
+		[] DIAMETER_PROC[idx].getreply(DIAMETEREM_register_imsi:{?,?}) {};
    }
 }
diff --git a/mme/ConnHdlr.ttcn b/mme/ConnHdlr.ttcn
index c1e32b8..e3e62f8 100644
--- a/mme/ConnHdlr.ttcn
+++ b/mme/ConnHdlr.ttcn
@@ -499,7 +499,7 @@
 /* Exepect AuthInfoReq (AIR) from HSS; respond with AuthInforAnswer (AIA) */
 private altstep as_DIA_AuthInfo() runs on ConnHdlr {
    var PDU_DIAMETER rx_dia;
-	[] DIAMETER.receive(tr_DIA_AIR(g_pars.ue_pars.imsi)) -> value rx_dia {
+	[] DIAMETER[0].receive(tr_DIA_AIR(g_pars.ue_pars.imsi)) -> value rx_dia {
    	var template (omit) AVP avp;
    	var octetstring sess_id;
    	var octetstring vplmn_id;
@@ -516,16 +516,16 @@
    	/* compute tuple */
    	auth_info_content := { ts_AVP_EutranVec(1, '20080c3818183b522614162c07601d0d'O, '6a91970e838fd079'O, 'f11b89a2a8be00001f9c526f3d75d44c'O, '95AFAD9A0D29AFAA079A9451DF7161D7EE4CBF2AF9387F766D058BB6B44B905D'O) };
-		DIAMETER.send(ts_DIA_AIA(auth_info_content, sess_id,
-					 hbh_id := rx_dia.hop_by_hop_id,
-					 ete_id := rx_dia.end_to_end_id));
+		DIAMETER[0].send(ts_DIA_AIA(auth_info_content, sess_id,
+					    hbh_id := rx_dia.hop_by_hop_id,
+					    ete_id := rx_dia.end_to_end_id));
    }
 }
/* Expect UpdateLocationReq (ULR); respond with UpdateLocationAnswer (ULA) */
 altstep as_DIA_UpdLoc() runs on ConnHdlr {
    var PDU_DIAMETER rx_dia;
-	[] DIAMETER.receive(tr_DIA_ULR(g_pars.ue_pars.imsi)) -> value rx_dia {
+	[] DIAMETER[0].receive(tr_DIA_ULR(g_pars.ue_pars.imsi)) -> value rx_dia {
    	var template (omit) AVP avp;
    	var hexstring imsi;
    	var template (value) AVP_list sub_data;
@@ -546,9 +546,9 @@
    		})
    		};
-		DIAMETER.send(ts_DIA_ULA(sub_data, avp.avp_data.avp_BASE_NONE_Session_Id,
-					 hbh_id := rx_dia.hop_by_hop_id,
-					 ete_id := rx_dia.end_to_end_id));
+		DIAMETER[0].send(ts_DIA_ULA(sub_data, avp.avp_data.avp_BASE_NONE_Session_Id,
+					    hbh_id := rx_dia.hop_by_hop_id,
+					    ete_id := rx_dia.end_to_end_id));
    }
 }
@@ -563,17 +563,17 @@
     */
    f_diameter_expect_eteid(ete_id);
-	DIAMETER.send(ts_DIA_CLR(g_pars.ue_pars.imsi, SGSN_UPDATE_PROCEDURE,
-		      orig_host := g_pars.hss_pars.local_diam_host,
-		      orig_realm := g_pars.hss_pars.diam_realm,
-		      dest_host := g_pars.hss_pars.remote_diam_host,
-		      dest_realm := g_pars.hss_pars.diam_realm,
-		      hbh_id := hbh_id,
-		      ete_id := ete_id));
+	DIAMETER[0].send(ts_DIA_CLR(g_pars.ue_pars.imsi, SGSN_UPDATE_PROCEDURE,
+			 orig_host := g_pars.hss_pars.local_diam_host,
+			 orig_realm := g_pars.hss_pars.diam_realm,
+			 dest_host := g_pars.hss_pars.remote_diam_host,
+			 dest_realm := g_pars.hss_pars.diam_realm,
+			 hbh_id := hbh_id,
+			 ete_id := ete_id));
alt {
-	[] DIAMETER.receive(tr_DIA_CLA) -> value rx_dia {}
-	[] DIAMETER.receive(PDU_DIAMETER:?) -> value rx_dia {
+	[] DIAMETER[0].receive(tr_DIA_CLA) -> value rx_dia {}
+	[] DIAMETER[0].receive(PDU_DIAMETER:?) -> value rx_dia {
    	Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter S6b msg rx: ", rx_dia));
    	}
    }
diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn
index df24a09..586c667 100644
--- a/mme/MME_Tests.ttcn
+++ b/mme/MME_Tests.ttcn
@@ -392,8 +392,8 @@
    	connect(vc_conn:SGsAP_PROC, vc_SGsAP:SGsAP_PROC);
    }
    if (isbound(vc_DIAMETER)) {
-		connect(vc_conn:DIAMETER, vc_DIAMETER:DIAMETER_CLIENT);
-		connect(vc_conn:DIAMETER_PROC, vc_DIAMETER:DIAMETER_PROC);
+		connect(vc_conn:DIAMETER[0], vc_DIAMETER:DIAMETER_CLIENT);
+		connect(vc_conn:DIAMETER_PROC[0], vc_DIAMETER:DIAMETER_PROC);
    }
    if (isbound(vc_GTP)) {
    	connect(vc_conn:GTP[0], vc_GTP:CLIENT);
@@ -424,7 +424,7 @@
    	remPort := mp_gn_remote_port
    };
-	if (DIAMETER_PROC.checkstate("Connected")) {
+	if (DIAMETER_PROC[0].checkstate("Connected")) {
    	f_diameter_expect_imsi(g_pars.ue_pars.imsi);
    }
    if (SGsAP_PROC.checkstate("Connected")) {
diff --git a/pcrf/PCRF_Tests.ttcn b/pcrf/PCRF_Tests.ttcn
index 7979d75..c62880d 100644
--- a/pcrf/PCRF_Tests.ttcn
+++ b/pcrf/PCRF_Tests.ttcn
@@ -34,6 +34,8 @@
    };
 }
+const integer DIA_Gx := 0;
+
 /* main component, we typically have one per testcase */
 type component MTC_CT {
@@ -53,48 +55,9 @@
    	}
 }
-type component DIAMETER_ConnHdlr_CT extends DIAMETER_ConnHdlr {
-	port DIAMETER_Conn_PT DIAMETER_CLIENT;
-	port DIAMETEREM_PROC_PT DIAMETER_PROC_CLIENT;
-}
-
-function f_diam_connhldr_ct_main(hexstring imsi) runs on DIAMETER_ConnHdlr_CT {
-	var DIAMETER_ConnHdlr vc_conn_unused;
-	var PDU_DIAMETER msg;
-	var UINT32 ete_id;
-
-	f_diameter_expect_imsi(imsi);
-
-	while (true) {
-		alt {
-		[] DIAMETER_CLIENT.receive(PDU_DIAMETER:?) -> value msg {
-			DIAMETER.send(msg);
-			}
-		[] DIAMETER.receive(PDU_DIAMETER:?) -> value msg {
-			DIAMETER_CLIENT.send(msg);
-			}
-		[] DIAMETER_PROC_CLIENT.getcall(DIAMETEREM_register_eteid:{?,?}) -> param(ete_id, vc_conn_unused) {
-			DIAMETER_PROC.call(DIAMETEREM_register_eteid:{ete_id, self}) {
-				[] DIAMETER_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {};
-				}
-			DIAMETER_PROC_CLIENT.reply(DIAMETEREM_register_eteid:{ete_id, vc_conn_unused});
-			}
-		}
-	}
-}
-
 /* per-session component; we typically have 1..N per testcase */
-type component Cli_Session_CT extends Prometheus_Checker_CT {
+type component Cli_Session_CT extends DIAMETER_ConnHdlr, Prometheus_Checker_CT {
    var SessionPars	g_pars;
-
-	port DIAMETER_Conn_PT Gx;
-	port DIAMETEREM_PROC_PT Gx_PROC;
-
-}
-function f_diam_connhldr_expect_eteid(UINT32 ete_id) runs on Cli_Session_CT {
-	Gx_PROC.call(DIAMETEREM_register_eteid:{ete_id, null}) {
-		[] Gx_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {};
-	}
 }
/* configuration data for a given Session */
@@ -162,7 +125,6 @@
 function f_start_handler(void_fn fn, template (omit) SessionPars pars_tmpl := omit)
 runs on MTC_CT return Cli_Session_CT {
    var charstring id := testcasename();
-	var DIAMETER_ConnHdlr_CT vc_conn_gx;
    var Cli_Session_CT vc_conn;
    var SessionPars pars;
@@ -174,12 +136,8 @@
vc_conn := Cli_Session_CT.create(id);
-	vc_conn_gx := DIAMETER_ConnHdlr_CT.create(id);
-	connect(vc_conn_gx:DIAMETER, vc_Gx:DIAMETER_CLIENT);
-	connect(vc_conn_gx:DIAMETER_PROC, vc_Gx:DIAMETER_PROC);
-	connect(vc_conn:Gx, vc_conn_gx:DIAMETER_CLIENT);
-	connect(vc_conn:Gx_PROC, vc_conn_gx:DIAMETER_PROC_CLIENT);
-	vc_conn_gx.start(f_diam_connhldr_ct_main(pars.imsi));
+	connect(vc_conn:DIAMETER[DIA_Gx], vc_Gx:DIAMETER_CLIENT);
+	connect(vc_conn:DIAMETER_PROC[DIA_Gx], vc_Gx:DIAMETER_PROC);
vc_conn.start(f_handler_init(fn, pars));
    return vc_conn;
@@ -188,6 +146,7 @@
 private function f_handler_init(void_fn fn, SessionPars pars)
 runs on Cli_Session_CT {
    g_pars := valueof(pars);
+	f_diameter_expect_imsi(g_pars.imsi, idx := DIA_Gx);
    f_prometheus_init(mp_pcrf_prometheus_hostname, mp_pcrf_prometheus_port);
    fn.apply();
 }
@@ -204,24 +163,24 @@
    /* Unlike CCR, CCA contains no IMSI. Register ete_id in DIAMETER_Emulation,
     * so CCA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT.
     */
-	f_diam_connhldr_expect_eteid(ete_id);
+	f_diameter_expect_eteid(ete_id, idx := DIA_Gx);
/* TODO: change this into a ts_DIA_ULR */
-	Gx.send(ts_DIA_Gx_CCR(hbh_id, ete_id,
-			      sess_id,
-			      {ts_AVP_SubcrIdType(END_USER_IMSI), ts_AVP_SubcrIdData(imsi)},
-			      apn,
-			      INITIAL_REQUEST,
-			      req_num := '00000000'O
-			      ));
+	DIAMETER[DIA_Gx].send(ts_DIA_Gx_CCR(hbh_id, ete_id,
+					    sess_id,
+					    {ts_AVP_SubcrIdType(END_USER_IMSI), ts_AVP_SubcrIdData(imsi)},
+					    apn,
+					    INITIAL_REQUEST,
+					    req_num := '00000000'O
+					    ));
    g_pars.gx_next_hbh_id := g_pars.gx_next_hbh_id + 1;
    g_pars.gx_next_ete_id := g_pars.gx_next_ete_id + 1;
alt {
-	[] Gx.receive(tr_DIA_Gx_CCA(sess_id)) -> value rx_dia {
+	[] DIAMETER[DIA_Gx].receive(tr_DIA_Gx_CCA(sess_id)) -> value rx_dia {
    	setverdict(pass);
    	}
-	[] Gx.receive(PDU_DIAMETER:?) -> value rx_dia {
+	[] DIAMETER[DIA_Gx].receive(PDU_DIAMETER:?) -> value rx_dia {
    	Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
    				log2str("Received unexpected DIAMETER ", rx_dia));
    	}
diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn
index 85d5820..9dd759b 100644
--- a/pgw/PGW_Tests.ttcn
+++ b/pgw/PGW_Tests.ttcn
@@ -26,7 +26,6 @@
 import from DIAMETER_ts32_299_Templates all;
 import from DIAMETER_Emulation all;
-
 modulepar {
    charstring mp_pgw_hostname := "127.0.0.4";
    charstring mp_local_hostname_c := "127.0.0.1";
@@ -49,6 +48,10 @@
    charstring mp_diam_realm := "localdomain";
 }
+const integer DIA_Gx := 0;
+const integer DIA_Gy := 1;
+const integer DIA_S6b := 2;
+
 /* main component, we typically have one per testcase */
 type component PGW_Test_CT extends GTP2_ConnHdlr, GTP1U_ConnHdlr {
    var GTPv2_Emulation_CT vc_GTP2;
@@ -80,38 +83,10 @@
    	}
 }
-type component DIAMETER_ConnHdlr_CT extends DIAMETER_ConnHdlr {
-	port DIAMETER_Conn_PT DIAMETER_CLIENT;
-}
-
-function f_diam_connhldr_ct_main(hexstring imsi) runs on DIAMETER_ConnHdlr_CT {
-	var PDU_DIAMETER msg;
-
-	if (DIAMETER_PROC.checkstate("Connected")) {
-		f_diameter_expect_imsi(imsi);
-	}
-
-	while (true) {
-		alt {
-		[] DIAMETER_CLIENT.receive(PDU_DIAMETER:?) -> value msg {
-			DIAMETER.send(msg);
-			}
-		[] DIAMETER.receive(PDU_DIAMETER:?) -> value msg {
-			DIAMETER_CLIENT.send(msg);
-			}
-		}
-	}
-}
-
-
 /* per-session component; we typically have 1..N per testcase */
-type component PGW_Session_CT extends GTP2_ConnHdlr, GTP1U_ConnHdlr {
+type component PGW_Session_CT extends GTP2_ConnHdlr, GTP1U_ConnHdlr, DIAMETER_ConnHdlr {
    var SessionPars	g_pars;
-	port DIAMETER_Conn_PT Gx;
-	port DIAMETER_Conn_PT Gy;
-	port DIAMETER_Conn_PT S6b;
-
    /* GTP-U IPv4 address remote sie */
    var OCT4	g_gtpu4_remote;
    var OCT16	g_gtpu6_remote;
@@ -332,7 +307,6 @@
 function f_start_handler(void_fn fn, template (omit) SessionPars pars_tmpl := omit)
 runs on PGW_Test_CT return PGW_Session_CT {
    var charstring id := testcasename();
-	var DIAMETER_ConnHdlr_CT vc_conn_gx, vc_conn_gy, vc_conn_s6b;
    var PGW_Session_CT vc_conn;
    var SessionPars pars;
@@ -349,27 +323,18 @@
    connect(vc_conn:GTP1U_PROC[0], vc_GTP1U:CLIENT_PROC);
if (isbound(vc_Gx)) {
-		vc_conn_gx := DIAMETER_ConnHdlr_CT.create(id);
-		connect(vc_conn_gx:DIAMETER, vc_Gx:DIAMETER_CLIENT);
-		connect(vc_conn_gx:DIAMETER_PROC, vc_Gx:DIAMETER_PROC);
-		connect(vc_conn:Gx, vc_conn_gx:DIAMETER_CLIENT);
-		vc_conn_gx.start(f_diam_connhldr_ct_main(pars.imsi));
+		connect(vc_conn:DIAMETER_PROC[DIA_Gx], vc_Gx:DIAMETER_PROC);
+		connect(vc_conn:DIAMETER[DIA_Gx], vc_Gx:DIAMETER_CLIENT);
    }
if (isbound(vc_Gy)) {
-		vc_conn_gy := DIAMETER_ConnHdlr_CT.create(id);
-		connect(vc_conn_gy:DIAMETER, vc_Gy:DIAMETER_CLIENT);
-		connect(vc_conn_gy:DIAMETER_PROC, vc_Gy:DIAMETER_PROC);
-		connect(vc_conn:Gy, vc_conn_gy:DIAMETER_CLIENT);
-		vc_conn_gy.start(f_diam_connhldr_ct_main(pars.imsi));
+		connect(vc_conn:DIAMETER_PROC[DIA_Gy], vc_Gy:DIAMETER_PROC);
+		connect(vc_conn:DIAMETER[DIA_Gy], vc_Gy:DIAMETER_CLIENT);
    }
if (isbound(vc_S6b)) {
-		vc_conn_s6b := DIAMETER_ConnHdlr_CT.create(id);
-		connect(vc_conn_s6b:DIAMETER, vc_S6b:DIAMETER_CLIENT);
-		connect(vc_conn_s6b:DIAMETER_PROC, vc_S6b:DIAMETER_PROC);
-		connect(vc_conn:S6b, vc_conn_s6b:DIAMETER_CLIENT);
-		vc_conn_s6b.start(f_diam_connhldr_ct_main(pars.imsi));
+		connect(vc_conn:DIAMETER_PROC[DIA_S6b], vc_S6b:DIAMETER_PROC);
+		connect(vc_conn:DIAMETER[DIA_S6b], vc_S6b:DIAMETER_CLIENT);
    }
vc_conn.start(f_handler_init(fn, pars));
@@ -379,6 +344,19 @@
 private function f_handler_init(void_fn fn, SessionPars pars)
 runs on PGW_Session_CT {
    g_pars := valueof(pars);
+
+	if (DIAMETER_PROC[DIA_Gx].checkstate("Connected")) {
+		f_diameter_expect_imsi(g_pars.imsi, idx := DIA_Gx);
+	}
+
+	if (DIAMETER_PROC[DIA_Gy].checkstate("Connected")) {
+		f_diameter_expect_imsi(g_pars.imsi, idx := DIA_Gy);
+	}
+
+	if (DIAMETER_PROC[DIA_S6b].checkstate("Connected")) {
+		f_diameter_expect_imsi(g_pars.imsi, idx := DIA_S6b);
+	}
+
    /* allocate + register TEI{C,D} on local side */
    g_pars.teic_local := f_gtp2_allocate_teic();
    g_pars.bearer.teid_local := f_gtp1u_allocate_teid();
@@ -404,19 +382,19 @@
 /* S6b emulation (AAA-Server) */
 private altstep as_DIA_S6b_AAR() runs on PGW_Session_CT {
    var PDU_DIAMETER rx_dia;
-	[] S6b.receive(tr_DIA_S6b_AAR()) -> value rx_dia {
+	[] DIAMETER[DIA_S6b].receive(tr_DIA_S6b_AAR()) -> value rx_dia {
    	var template (omit) AVP avp;
    	var octetstring sess_id;
avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id);
    	sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id);
-		S6b.send(ts_DIA_S6b_AAA(sess_id, "aaa." & mp_diam_realm,
-					mp_diam_realm, mp_diam_realm,
-					rx_dia.hop_by_hop_id, rx_dia.end_to_end_id));
+		DIAMETER[DIA_S6b].send(ts_DIA_S6b_AAA(sess_id, "aaa." & mp_diam_realm,
+						      mp_diam_realm, mp_diam_realm,
+						      rx_dia.hop_by_hop_id, rx_dia.end_to_end_id));
    	setverdict(pass);
    }
-	[] S6b.receive(PDU_DIAMETER:?) -> value rx_dia {
+	[] DIAMETER[DIA_S6b].receive(PDU_DIAMETER:?) -> value rx_dia {
    	Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
    				log2str("Received unexpected DIAMETER ", rx_dia));
    }
@@ -425,7 +403,7 @@
 /* Gx emulation (PCRF)*/
 private altstep as_DIA_Gx_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT {
    var PDU_DIAMETER rx_dia;
-	[] Gx.receive(tr_DIA_Gx_CCR(req_type := req_type)) -> value rx_dia {
+	[] DIAMETER[DIA_Gx].receive(tr_DIA_Gx_CCR(req_type := req_type)) -> value rx_dia {
    	var template (omit) AVP avp;
    	var octetstring sess_id;
    	var AVP_Unsigned32 req_num;
@@ -436,10 +414,10 @@
    	avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_DCC_NONE_CC_Request_Number);
    	req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number);
-		Gx.send(ts_DIA_Gx_CCA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id,
-					 req_type, req_num));
+		DIAMETER[DIA_Gx].send(ts_DIA_Gx_CCA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id,
+						    req_type, req_num));
    }
-	[] Gx.receive(PDU_DIAMETER:?) -> value rx_dia {
+	[] DIAMETER[DIA_Gx].receive(PDU_DIAMETER:?) -> value rx_dia {
    	Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
    				log2str("Received unexpected DIAMETER ", rx_dia));
    }
@@ -643,12 +621,12 @@
private altstep as_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type)
 runs on PGW_Session_CT {
-	[] Gy.receive(f_tr_DIA_Gy_CCR(req_type := req_type)) -> value g_rx_gy {
+	[] DIAMETER[DIA_Gy].receive(f_tr_DIA_Gy_CCR(req_type := req_type)) -> value g_rx_gy {
    	var template (value) PDU_DIAMETER tx_dia;
    	tx_dia := f_ts_DIA_Gy_CCA(g_rx_gy);
-		Gy.send(tx_dia);
+		DIAMETER[DIA_Gy].send(tx_dia);
    }
-	[] Gy.receive(PDU_DIAMETER:?) -> value g_rx_gy {
+	[] DIAMETER[DIA_Gy].receive(PDU_DIAMETER:?) -> value g_rx_gy {
    	Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
    				log2str("Received unexpected DIAMETER Gy", g_rx_gy));
    }
@@ -794,14 +772,14 @@
    g2c.gtpcv2_pdu.createSessionRequest.servingNetwork := ts_GTP2C_ServingNetwork('001'H, '01F'H);
GTP2.send(g2c);
-	if (do_s6b and S6b.checkstate("Connected")) {
+	if (do_s6b and DIAMETER[DIA_S6b].checkstate("Connected")) {
    	as_DIA_S6b_AAR();
    }
-	if (Gx.checkstate("Connected")) {
+	if (DIAMETER[DIA_Gx].checkstate("Connected")) {
    	as_DIA_Gx_CCR(INITIAL_REQUEST);
    }
    /* FIXME: When on S2b interface, SMF is not using the Gy interface, unknown reason. */
-	if (Gy.checkstate("Connected")) {
+	if (DIAMETER[DIA_Gy].checkstate("Connected")) {
    	as_DIA_Gy_CCR(INITIAL_REQUEST);
    }
    alt {
@@ -920,10 +898,10 @@
    				  teid_list := {}, bearer_id := g_pars.bearer.ebi);
GTP2.send(g2c);
-	if (Gx.checkstate("Connected") and expect_diameter) {
+	if (DIAMETER[DIA_Gx].checkstate("Connected") and expect_diameter) {
    	as_DIA_Gx_CCR(TERMINATION_REQUEST);
    }
-	if (Gy.checkstate("Connected") and expect_diameter) {
+	if (DIAMETER[DIA_Gy].checkstate("Connected") and expect_diameter) {
    	as_DIA_Gy_CCR(TERMINATION_REQUEST);
    }
    alt {
-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43284?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email

Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Id88b88d2f3472e1f4daa8344ca1fc6d408edfb62
Gerrit-Change-Number: 43284
Gerrit-PatchSet: 3
Gerrit-Owner: pespin pespin@sysmocom.de
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria vyanitskiy@sysmocom.de
Gerrit-Reviewer: laforge laforge@osmocom.org
Gerrit-Reviewer: osmith osmith@sysmocom.de
Gerrit-Reviewer: pespin pespin@sysmocom.de



    