Commit b5fd59bc authored by rennoch's avatar rennoch
Browse files

further parameterization of IE parameter templates

parent ed421598
Loading
Loading
Loading
Loading
+24 −11
Original line number Diff line number Diff line
@@ -93,16 +93,28 @@ group g_E_RAB_SetupRequest {

group g_E_RAB_SetupResponse {
	
	template E_RABSetupResponse.protocolIEs[-] mw_E_RABSetupResponseIEs_MME := {
	template E_RABSetupResponse.protocolIEs[-] mw_E_RABSetupResponseIEs_MME(template
																			(present)
																			MME_UE_S1AP_ID
																				p_parm
																			:=
																			?)
		:= {
		id := S1AP_Constants.id_MME_UE_S1AP_ID,
		criticality := S1AP_CommonDataTypes.ignore,
		value_ := { MME_UE_S1AP_ID := ? }
		value_ := {MME_UE_S1AP_ID := p_parm}
	}

	template E_RABSetupResponse.protocolIEs[-] mw_E_RABSetupResponseIEs_ENB := {
	template E_RABSetupResponse.protocolIEs[-] mw_E_RABSetupResponseIEs_ENB(template
																			(present)
	                                                                        ENB_UE_S1AP_ID
																				p_parm
																			:=
																			?)
		:= {
		id := S1AP_Constants.id_eNB_UE_S1AP_ID,
		criticality := S1AP_CommonDataTypes.ignore,
		value_ := { ENB_UE_S1AP_ID := ? }
		value_ := {ENB_UE_S1AP_ID := p_parm}
	}

	template E_RABSetupResponse.protocolIEs[-] mw_E_RABSetupResponseIEs_ERAB 
@@ -146,17 +158,18 @@ group g_IEParameters {
		iE_Extensions := omit
	}
	
	template(present) E_RABSetupItemBearerSURes mw_E_RABSetupItemBearerSURes:=  {
		 e_RAB_ID                        := ?,
	template(present) E_RABSetupItemBearerSURes mw_E_RABSetupItemBearerSURes (template(present) E_RAB_ID p_e_RAB_ID := ?):=  {
		 e_RAB_ID                        := p_e_RAB_ID,
		 transportLayerAddress           := '?'B,
		 gTP_TEID                        := ?,
		 iE_Extensions                   := *
	 }
	 
	template(present) E_RABItem mw_E_RABItem (template Cause p_cause:=?):=  {
		 e_RAB_ID                        := ?,
		 cause                           := p_cause,
		 iE_Extensions                   := *
	template(present) E_RABItem mw_E_RABItem(template(present) E_RAB_ID
												 p_e_RAB_ID := ?,
											 template(present) Cause p_cause :=
											 ?) := {
		e_RAB_ID := p_e_RAB_ID,cause := p_cause,iE_Extensions := *
	}
	        
} // end of group g_IEParameters
+7 −6
Original line number Diff line number Diff line
@@ -51,9 +51,10 @@ module S1AP_Testcase {
												 m_E_RABSetupRequestIEs_MME(1),
												 m_E_RABSetupRequestIEs_ENB(1),
												 m_E_RABSetupRequestIEs_ERAB({
																				 m_E_RABToBeSetupItemBearerSUReq,
																				 m_E_RABToBeSetupItemBearerSUReq
																				 (-
																				 (1),
																				 m_E_RABToBeSetupItemBearerSUReq
																				 (2
																				  ,
																				  m_e_RABlevelQoSParameters
																				  (255))
@@ -62,16 +63,16 @@ module S1AP_Testcase {
		eBport
		.receive(mw_successfulOutcome_E_RABSetupResponse(-,
														 {
															 mw_E_RABSetupResponseIEs_MME,
															 mw_E_RABSetupResponseIEs_ENB,
															 mw_E_RABSetupResponseIEs_MME(1),
															 mw_E_RABSetupResponseIEs_ENB(1),
															 mw_E_RABSetupResponseIEs_ERAB
															 ({
																  mw_E_RABSetupItemBearerSURes
																  mw_E_RABSetupItemBearerSURes(1)
															  }),
															 mw_E_RABSetupResponseIEs_fSUL
															 ({
																  mw_E_RABItem
																  ({
																  (2,{
																	   radioNetwork
																		   :=
																		   not_supported_QCI_value