Commit f7e21db8 authored by rennoch's avatar rennoch
Browse files

cleanup of types not needed

parent 02f35237

ttcn3/S1AP_Templates.ttcn3

+21 −31
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@ module S1AP_Templates { 
		}

	}



	template S1AP_PDU m_initiatingMessage_E_RABSetup(RecordOf_E_RABSetupRequestIEs p_value) := {

	template S1AP_PDU m_initiatingMessage_E_RABSetup(E_RABSetupRequest.protocolIEs p_value) := {

		initiatingMessage := {

			procedureCode := id_E_RABSetup,

			criticality := reject,

			value_ := {RecordOf_E_RABSetupRequestIEs := p_value}

			value_ := {E_RABSetupRequest.protocolIEs := p_value}

		}

	}
@@ -34,31 +34,21 @@ module S1AP_Templates { 


	group g_outcomeMessage {



//		template S1AP_PDU mw_successfulOutcome(template ProcedureCode

//												   p_procedureCode := ?,

//											   template anytype p_value) := {

//			successfulOutcome := {

//				procedureCode := p_procedureCode,

//				criticality := reject,

//				value_ := {

//					RecordOf_E_RABSetupResponseIEs := {

//						mw_E_RABSetupResponseIEs_MME,

//						mw_E_RABSetupResponseIEs_ENB,

//						mw_E_RABSetupResponseIEs_ERAB

//					}

//				}

//			}

//		}



		template S1AP_PDU mw_successfulOutcome_E_RABSetupResponse

		(template ProcedureCode p_procedureCode := ?,

											   template RecordOf_E_RABSetupResponseIEs p_value) := {

		template S1AP_PDU mw_successfulOutcome_E_RABSetupResponse(template

																  (present)

																  ProcedureCode

																	  p_procedureCode

																  := ?,

																  template

																  (present)

																  E_RABSetupResponse

																  .protocolIEs

																	  p_value)

			:= {

			successfulOutcome := {

				procedureCode := p_procedureCode,

				criticality := reject,

				value_ := {

					RecordOf_E_RABSetupResponseIEs := p_value

				}

				value_ := {E_RABSetupResponse.protocolIEs := p_value}

			}

		}
@@ -66,18 +56,18 @@ module S1AP_Templates { 
	

group g_E_RAB_IEsend {



	template(value) ProtocolIEs m_E_RAB_IE_MME (MME_UE_S1AP_ID p_value:= 1):= {

	template(value) ProtocolIE m_E_RAB_IE_MME (MME_UE_S1AP_ID p_value:= 1):= {

		id := S1AP_Constants.id_MME_UE_S1AP_ID,

		criticality := S1AP_CommonDataTypes.reject,

		value_ := { MME_UE_S1AP_ID := p_value }

	}



	template(value) ProtocolIEs m_E_RAB_IE_ENB (ENB_UE_S1AP_ID p_value:= 1):= {

	template(value) ProtocolIE m_E_RAB_IE_ENB (ENB_UE_S1AP_ID p_value:= 1):= {

		id := S1AP_Constants.id_eNB_UE_S1AP_ID,

		criticality := S1AP_CommonDataTypes.reject,

		value_ := { ENB_UE_S1AP_ID := p_value }

	}		

	template(value) ProtocolIEs m_E_RAB_IE_ERAB (RecordOf_E_RABToBeSetupItemBearerSUReq p_value := {m_E_RABToBeSetupItemBearerSUReq}):= {

	template(value) ProtocolIE m_E_RAB_IE_ERAB (RecordOf_E_RABToBeSetupItemBearerSUReq p_value := {m_E_RABToBeSetupItemBearerSUReq}):= {

		id := S1AP_Constants.id_E_RABToBeSetupListBearerSUReq,

		criticality := S1AP_CommonDataTypes.reject,

		value_ := { RecordOf_E_RABToBeSetupItemBearerSUReq := p_value }
@@ -87,28 +77,28 @@ group g_E_RAB_IEsend { 


group g_E_RAB_IEreceive {

	

	template ProtocolIEs mw_E_RAB_IE_MME(template(present) MME_UE_S1AP_ID p_parm

	template ProtocolIE mw_E_RAB_IE_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 := p_parm}

	}



	template ProtocolIEs mw_E_RAB_IE_ENB(template(present) ENB_UE_S1AP_ID p_parm

	template ProtocolIE mw_E_RAB_IE_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 := p_parm}

	}



	template ProtocolIEs mw_E_RAB_IE_ERAB 

	template ProtocolIE mw_E_RAB_IE_ERAB 

	  (template(present) RecordOf_E_RABSetupItemBearerSURes p_value := {mw_E_RABSetupItemBearerSURes}):= {

		id := S1AP_Constants.id_E_RABSetupListBearerSURes,

		criticality := S1AP_CommonDataTypes.ignore,

		value_ := { RecordOf_E_RABSetupItemBearerSURes := p_value }

	}

	

	template ProtocolIEs mw_E_RAB_IE_fSUL 

	template ProtocolIE mw_E_RAB_IE_fSUL 

	  (template(present) RecordOf_E_RABItem p_value := {?}):= {

		id := S1AP_Constants.id_E_RABFailedToSetupListBearerSURes,

		criticality := S1AP_CommonDataTypes.ignore,

ttcn3/S1AP_Types.ttcn3

+1 −3
Original line number Diff line number Diff line
@@ -14,12 +14,10 @@ module S1AP_Types { 
    type port S1AP_PortType message {inout S1AP_PDU};

    type component MME {port S1AP_PortType eBport}



	type record of E_RABSetupRequest.protocolIEs[-] RecordOf_E_RABSetupRequestIEs;

	type record of E_RABSetupResponse.protocolIEs[-] RecordOf_E_RABSetupResponseIEs;

    type record of E_RABToBeSetupItemBearerSUReq RecordOf_E_RABToBeSetupItemBearerSUReq;

    type record of E_RABSetupItemBearerSURes RecordOf_E_RABSetupItemBearerSURes;

    type record of E_RABItem RecordOf_E_RABItem;

    type record ProtocolIEs {

    type record ProtocolIE {

		integer id (0 .. 65535),

		enumerated {

			reject, ignore, notify