correction due to validation errors on iE_Extensions types (3219fb55) · Commits · INT - Core Network and Interoperability Testing / Evolved_Packet_Core / S1AP

ttcn3/LibS1AP/LibS1AP_Templates.ttcn

+18 −0

Original line number	Diff line number	Diff line
		@@ -1215,6 +1215,16 @@ module LibS1AP_Templates {
		mw_nasSecurityParametersToEutran_IE(p_nasSecurityParametersToEutran_value)
		} // End of template mw_HandoverCommandIEs_NASSecurity

		template (present) RecordOf_ProtocolIE mw_HandoverCommandIEs_ERABSubj2FwList(
		template (present) MME_UE_S1AP_ID p_MME_value := ?,
		template (present) ENB_UE_S1AP_ID p_eNB_value := ?,
		template (present) HandoverType p_HandoverType_value := ?,
		template (present) Target_ToSource_TransparentContainer p_Target_ToSource_TransparentContainer_value := ?,
		template (present) E_RABSubjecttoDataForwardingList p_E_RABSubjecttoDataForwardingList_value := ?
		) modifies mw_HandoverCommandIEs:= {
		mw_E_RABSubjecttoDataForwardingList_IE(p_E_RABSubjecttoDataForwardingList_value)
		} // End of template mw_HandoverCommandIEs_ERABSubj2FwList

		template (present) RecordOf_ProtocolIE mw_HandoverCommandIEs_T2STransCont2nd_NASSecurity(
		template (present) MME_UE_S1AP_ID p_MME_value := ?,
		template (present) ENB_UE_S1AP_ID p_eNB_value := ?,
		@@ -5797,6 +5807,14 @@ module LibS1AP_Templates {
		value_ := { RecordOf_E_RABToBeModifiedItemBearerModInd := p_value}
		}

		template (present) ProtocolIE mw_E_RABSubjecttoDataForwardingList_IE(
		template (present) E_RABSubjecttoDataForwardingList p_value := ?
		) := {
		id := S1AP_Constants.id_E_RABSubjecttoDataForwardingList,
		criticality := reject,
		value_ := { E_RABSubjecttoDataForwardingList := p_value}
		}

		/**
		* @desc Receive template for SuccessfulOutcome/R-RAB_Setup message
		* @param p_value The expected protocol information elements. Default: ?

ttcn3/S1AP_TCFunctions.ttcn

+81 −7

Original line number	Diff line number	Diff line
		@@ -357,7 +357,17 @@ module S1AP_TCFunctions {
		c_transportLayerAddress,
		c_gTP_TEID,
		c_nAS_PDU,
		{m_correlationID_IE('01020304'O), m_SIPTO_correlationID_IE('01020304'O)} // iE_Extensions
		//{m_correlationID_IE('01020304'O), m_SIPTO_correlationID_IE('01020304'O)} // iE_Extensions
		// Following code replaces upper commented line - IEs are extensionList type.
		{{id := 156,//S1AP_Constants.id_Correlation_ID,
		criticality := ignore,
		extensionValue := {Correlation_ID := '01020304'O}
		},
		{id := 183,// S1AP_Constants.id_SIPTO_Correlation_ID,
		criticality := ignore,
		extensionValue := {Correlation_ID := '01020304'O}
		}
		}
		)}
		));

		@@ -1424,14 +1434,24 @@ module S1AP_TCFunctions {
		vc_MME_UE_ID,
		vc_eNB_UE_ID,
		m_UEAggregateMaximumBitrate(1,1),
		{m_E_RABToBeSetupItemBearerSUReq (
		{m_E_RABToBeSetupItemCtxtSUReq(
		c_E_RAB_ID_A,
		m_e_RABlevelQoSParameters
		(1),
		c_transportLayerAddress,
		c_gTP_TEID,
		c_nAS_PDU,
		{m_correlationID_IE('01020304'O), m_SIPTO_correlationID_IE('01020304'O)} // iE_Extensions
		//{m_correlationID_IE('01020304'O), m_SIPTO_correlationID_IE('01020304'O)} // iE_Extensions
		// Following code replaces upper commented line - IEs are extensionList type.
		{{id := 156,//S1AP_Constants.id_Correlation_ID,
		criticality := ignore,
		extensionValue := {Correlation_ID := '01020304'O}
		},
		{id := 183,// S1AP_Constants.id_SIPTO_Correlation_ID,
		criticality := ignore,
		extensionValue := {Correlation_ID := '01020304'O}
		}
		}
		)},
		m_UESecurityCapabilities('0101010101010101'B,'0101010101010101'B),
		m_securityKey
		@@ -2041,8 +2061,50 @@ module S1AP_TCFunctions {
		)}
		));

		//TODO check case1 and case2 option
		if (PX_VA==1)//cASE 1
		{
		f_recv_HandoverCancel(
		mw_HandoverCancelIEs(
		vc_MME_UE_ID,
		vc_eNB_UE_ID,
		?
		));

		f_recv_E_RABModifiedResponse(mw_E_RABModifiedResIEs(
		vc_MME_UE_ID,
		vc_eNB_UE_ID,
		{
		mw_E_RABModifyItemBearerModRes(
		c_E_RAB_ID_A
		)
		}
		));
		}
		else
		if (PX_VA==2)//cASE 2
		{
		f_recv_E_RABModifiedResponse(mw_E_RABModifiedResIEs_FailedToModifyList(
		vc_MME_UE_ID,
		vc_eNB_UE_ID,
		{
		mw_E_RABItem(
		c_E_RAB_ID_A,
		{
		radioNetwork := (s1_intra_system_handover_triggered,
		s1_inter_system_handover_triggered)
		}
		)
		}
		));

		f_recv_HandoverCommand(mw_HandoverCommandIEs_ERABSubj2FwList(
		vc_MME_UE_ID,
		vc_eNB_UE_ID,
		intralte,
		?,
		?
		));
		}

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
		}
		@@ -2783,11 +2845,23 @@ module S1AP_TCFunctions {
		),
		m_resetType_partOfS1_Interface(
		{
		m_uE_associatedLogicalS1_ConnectionItemResAck_IE(
		/*m_uE_associatedLogicalS1_ConnectionItemResAck_IE(
		m_uE_associatedLogicalS1_ConnectionItem(
		0,
		0
		))
		)),*/
		// Following code replaces upper commented line due to validation check error
		//expression at [0].criticality is not of type 'enumerated
		// Type_824701419588_UE_associatedLogicalS1_ConnectionListRes_3 {
		// reject(0),
		// ignore(1),
		// notify(2)
		//}'
		{
		id := 91,//S1AP_Constants.id_UE_associatedLogicalS1_ConnectionItem,
		criticality := reject,
		value_ := { UE_associatedLogicalS1_ConnectionItem := valueof(m_uE_associatedLogicalS1_ConnectionItem(0,0))}
		}
		}
		)
		));