STF160 proposed modifications applied to LibIMS (b288c53d) · Commits · TTCN-3 Libraries / LibIms

ttcn/LibIms_Steps.ttcn

+15 −7

Original line number	Original line	Diff line number	Diff line
	@@ -459,7 +459,9 @@ module LibIms_Steps {
	v_params := {		v_params := {
	{		{
	id := c_tagId,		id := c_tagId,
	paramValue := f_getRndTag()		paramValue := {
			tokenOrHost := f_getRndTag()
			}
	}		}
	};		};
	vc_from := {		vc_from := {
	@@ -472,7 +474,9 @@ module LibIms_Steps {
	v_params := {		v_params := {
	{		{
	id := c_expiresId,		id := c_expiresId,
	paramValue := c_shortRegistration		paramValue := {
			tokenOrHost := c_shortRegistration
			}
	}		}
	};		};
	vc_contact.contactBody.contactAddresses[0].contactParams := v_params;		vc_contact.contactBody.contactAddresses[0].contactParams := v_params;
	@@ -623,7 +627,9 @@ module LibIms_Steps {
	fromParams := {		fromParams := {
	{		{
	id := c_tagId,		id := c_tagId,
	paramValue := p_tag_str		paramValue := {
			tokenOrHost := p_tag_str
			}
	}		}
	}		}
	};		};
	@@ -793,7 +799,9 @@ module LibIms_Steps {
	vc_contact.contactBody.contactAddresses[0].contactParams := {		vc_contact.contactBody.contactAddresses[0].contactParams := {
	{		{
	"expires",		"expires",
	int2str(3600)		{
			tokenOrHost := int2str(3600)
			}
	}		}
	};		};
	}		}
	@@ -903,7 +911,7 @@ module LibIms_Steps {

	// Preamble		// Preamble
	//NOTE STF471: removed f_init_userprofile(p_userprofile); // assignment of PIXIT values to component variable		//NOTE STF471: removed f_init_userprofile(p_userprofile); // assignment of PIXIT values to component variable
	vc_sdp_local := valueof(m_SDP_bandwidth(m_media_dynPT(PX_SIP_SDP_DYN, PX_SIP_SDP_ENCODING), vc_userprofile));		vc_sdp_local := valueof(m_SDP_bandwidth(m_media_dynPT(PX_SIP_SDP_DYN, PX_SIP_SDP_ENCODING, PX_SIP_SDP_CLOCKRATE, omit), vc_userprofile));
	vc_contact := m_Contact(m_SipUrl_contactIpaddr(vc_userprofile));		vc_contact := m_Contact(m_SipUrl_contactIpaddr(vc_userprofile));
	}		}

	@@ -925,7 +933,7 @@ module LibIms_Steps {

	// Preamble		// Preamble
	//NOTE STF471: removed f_init_userprofile(p_userprofile); // assignment of PIXIT values to component variable		//NOTE STF471: removed f_init_userprofile(p_userprofile); // assignment of PIXIT values to component variable
	vc_sdp_local := valueof(m_SDP_bandwidth(m_media_dynPT(PX_SIP_SDP_DYN, PX_SIP_SDP_ENCODING), vc_userprofile));		vc_sdp_local := valueof(m_SDP_bandwidth(m_media_dynPT(PX_SIP_SDP_DYN, PX_SIP_SDP_ENCODING, PX_SIP_SDP_CLOCKRATE, omit), vc_userprofile));
	}		}

	/**		/**
	@@ -1035,7 +1043,7 @@ module LibIms_Steps {
	// Preamble		// Preamble
	//NOTE STF471: removed f_init_interfaceprofile(p_interface);		//NOTE STF471: removed f_init_interfaceprofile(p_interface);
	//NOTE STF471: removed f_init_userprofile(p_userprofile); // assignment of PIXIT values to component variable		//NOTE STF471: removed f_init_userprofile(p_userprofile); // assignment of PIXIT values to component variable
	vc_sdp_local := valueof(m_SDP_bandwidth(m_media_dynPT(PX_SIP_SDP_DYN, PX_SIP_SDP_ENCODING), vc_userprofile));		vc_sdp_local := valueof(m_SDP_bandwidth(m_media_dynPT(PX_SIP_SDP_DYN, PX_SIP_SDP_ENCODING, PX_SIP_SDP_CLOCKRATE, omit), vc_userprofile));
	vc_contact := m_Contact(m_SipUrl_contactIpaddr(vc_userprofile));		vc_contact := m_Contact(m_SipUrl_contactIpaddr(vc_userprofile));
	}		}

ttcn/LibIms_Templates.ttcn

+24 −22

Original line number	Original line	Diff line number	Diff line
	@@ -120,7 +120,7 @@ module LibIms_Templates {
	}		}

	template(present) SemicolonParam_List mw_semicolonParams_realm(		template(present) SemicolonParam_List mw_semicolonParams_realm(
	template charstring p_realm		template GenValue p_realm
	) :=		) :=
	superset(		superset(
	{		{
	@@ -133,7 +133,7 @@ module LibIms_Templates {
	},		},
	{		{
	"algorithm",		"algorithm",
	"AKAv1-MD5"		{ tokenOrHost := "AKAv1-MD5" }
	},		},
	{		{
	"ik",		"ik",
	@@ -146,7 +146,7 @@ module LibIms_Templates {
	);		);

	template(value) SemicolonParam_List m_semicolonParams_language(		template(value) SemicolonParam_List m_semicolonParams_language(
	template(omit) charstring p_language := omit		template(omit) GenValue p_language := omit
	) := {		) := {
	{		{
	"language",		"language",
	@@ -155,7 +155,7 @@ module LibIms_Templates {
	}		}

	template(present) SemicolonParam_List mw_semicolonParams_language(		template(present) SemicolonParam_List mw_semicolonParams_language(
	template charstring p_language		template GenValue p_language
	) := {		) := {
	{		{
	"language",		"language",
	@@ -164,7 +164,7 @@ module LibIms_Templates {
	}		}

	template(value) SemicolonParam_List m_semicolonParams_isub(		template(value) SemicolonParam_List m_semicolonParams_isub(
	template(omit) charstring p_address := omit		template(omit) GenValue p_address := omit
	) := {		) := {
	{		{
	"isub",		"isub",
	@@ -260,7 +260,7 @@ module LibIms_Templates {
	genericParams := {		genericParams := {
	{		{
	id := "extension-access-info",		id := "extension-access-info",
	paramValue := "192.1.1.20"		paramValue := { tokenOrHost := "192.1.1.20" }
	}		}
	}		}
	}		}
	@@ -277,11 +277,11 @@ module LibIms_Templates {
	chargeAddrParams := {		chargeAddrParams := {
	{		{
	id := "ccf",		id := "ccf",
	paramValue := "192.1.1.1"		paramValue := { tokenOrHost := "192.1.1.1" }
	}, // value is fixed because it is deleted on proxy		}, // value is fixed because it is deleted on proxy
	{		{
	id := "ecf",		id := "ecf",
	paramValue := "192.1.1.2"		paramValue := { tokenOrHost := "192.1.1.2" }
	} // value is fixed because it is deleted on proxy		} // value is fixed because it is deleted on proxy
	}		}
	}		}
	@@ -302,12 +302,12 @@ module LibIms_Templates {
	}		}

	template(value) PChargingVector m_pChargingVector_origIoi_fixedValue(		template(value) PChargingVector m_pChargingVector_origIoi_fixedValue(
	template(value) charstring p_homeDomain		template(value) GenValue p_homeDomain
	) modifies m_pChargingVector_icid_TS := {		) modifies m_pChargingVector_icid_TS := {
	chargeParams := {		chargeParams := {
	{		{
	id := c_icid_generated_at,		id := c_icid_generated_at,
	paramValue := "192.1.1.10"		paramValue := { tokenOrHost := "192.1.1.10" }
	},		},
	{		{
	id := c_orig_ioi,		id := c_orig_ioi,
	@@ -317,12 +317,12 @@ module LibIms_Templates {
	}		}

	template(value) PChargingVector m_pChargingVector_termIoi_fixedValue(		template(value) PChargingVector m_pChargingVector_termIoi_fixedValue(
	template(value) charstring p_homeDomain		template(value) GenValue p_homeDomain
	) modifies m_pChargingVector_icid_TS := {		) modifies m_pChargingVector_icid_TS := {
	chargeParams := {		chargeParams := {
	{		{
	id := c_icid_generated_at,		id := c_icid_generated_at,
	paramValue := "192.1.1.10"		paramValue := { tokenOrHost := "192.1.1.10" }
	},		},
	{		{
	id := c_term_ioi,		id := c_term_ioi,
	@@ -332,7 +332,7 @@ module LibIms_Templates {
	}		}

	template(value) PChargingVector m_pChargingVector_accessNetwInfo(		template(value) PChargingVector m_pChargingVector_accessNetwInfo(
	template(value) charstring p_homeDomain		template(value) GenValue p_homeDomain
	) modifies m_pChargingVector_icid_TS := {		) modifies m_pChargingVector_icid_TS := {
	chargeParams := {		chargeParams := {
	{		{
	@@ -341,7 +341,7 @@ module LibIms_Templates {
	},		},
	{		{
	id := c_access_network_charging_info,		id := c_access_network_charging_info,
	paramValue := "192.1.1.10"		paramValue := { tokenOrHost := "192.1.1.10" }
	}		}
	}		}
	}		}
	@@ -349,7 +349,7 @@ module LibIms_Templates {
	// NOTE STF471 change: icidValue added		// NOTE STF471 change: icidValue added
	template(present) PChargingVector mw_pChargingVector(		template(present) PChargingVector mw_pChargingVector(
	template(present) charstring p_id := ?,		template(present) charstring p_id := ?,
	template charstring p_paramValue		template GenValue p_paramValue
	) := {		) := {
	fieldName := P_CHARGING_VECTOR_E,		fieldName := P_CHARGING_VECTOR_E,
	icidValue := ?,		icidValue := ?,
	@@ -547,7 +547,7 @@ module LibIms_Templates {
	toParams := {		toParams := {
	{		{
	id := c_tagId,		id := c_tagId,
	paramValue := f_getRndTag()		paramValue := { tokenOrHost := f_getRndTag() }
	}		}
	}		}
	}		}
	@@ -564,7 +564,9 @@ module LibIms_Templates {
	viaParams := {		viaParams := {
	{		{
	id := c_branchId,		id := c_branchId,
	paramValue := p_branch_val		paramValue := {
			tokenOrHost := p_branch_val
			}
	}		}
	}		}
	}		}
	@@ -591,7 +593,7 @@ module LibIms_Templates {
	viaParams := {		viaParams := {
	{		{
	id := c_branchId,		id := c_branchId,
	paramValue := "abcd0000"		paramValue := { tokenOrHost := "abcd0000" }
	}		}
	}		}
	}		}
	@@ -1658,7 +1660,7 @@ module LibIms_Templates {
	template(value) To p_to,		template(value) To p_to,
	template(value) Via p_via,		template(value) Via p_via,
	template(omit) Route p_route := omit,		template(omit) Route p_route := omit,
	template(value) charstring p_cause		template(value) GenValue p_cause
	) modifies m_BYE_Request_Base := {		) modifies m_BYE_Request_Base := {
	msgHeader := {		msgHeader := {
	reason := mw_Reason(p_cause),		reason := mw_Reason(p_cause),
	@@ -2465,7 +2467,7 @@ module LibIms_Templates {
	template(omit) Require p_require := omit,		template(omit) Require p_require := omit,
	template(omit) Route p_route := omit,		template(omit) Route p_route := omit,
	template(omit) Supported p_supported := omit,		template(omit) Supported p_supported := omit,
	template(value) charstring p_homeDomain		template(value) GenValue p_homeDomain
	) modifies m_MESSAGE_Request_NoBody_UE := {		) modifies m_MESSAGE_Request_NoBody_UE := {
	msgHeader := {		msgHeader := {
	pChargingFunctionAddresses := m_pChargingFunctionAddresses_fixedValue,		pChargingFunctionAddresses := m_pChargingFunctionAddresses_fixedValue,
	@@ -3326,7 +3328,7 @@ module LibIms_Templates {

	template(present) MESSAGE_Request mw_MESSAGE_Request_PchargingVector(		template(present) MESSAGE_Request mw_MESSAGE_Request_PchargingVector(
	template(present) charstring p_id := ?,		template(present) charstring p_id := ?,
	template charstring p_paramValue		template GenValue p_paramValue
	) modifies mw_MESSAGE_Request_Base := {		) modifies mw_MESSAGE_Request_Base := {
	msgHeader := {		msgHeader := {
	pChargingVector := mw_pChargingVector(p_id, p_paramValue)		pChargingVector := mw_pChargingVector(p_id, p_paramValue)
	@@ -4323,7 +4325,7 @@ module LibIms_Templates {
	template(value) To p_to,		template(value) To p_to,
	template(value) Via p_via,		template(value) Via p_via,
	template(omit) Contact p_contact := omit,		template(omit) Contact p_contact := omit,
	template(value) charstring p_cause		template(value) GenValue p_cause
	) modifies m_Response_onINVITE := {		) modifies m_Response_onINVITE := {
	msgHeader := {		msgHeader := {
	reason := mw_Reason(p_cause)		reason := mw_Reason(p_cause)