Changes done during STF482 validation: week4/2015 (cdc33e28) · Commits · INT - Core Network and Interoperability Testing / DIAMETER / DiameterS9

DiameterS9/ttcn/DiameterS9_Gxx_TCFunctions.ttcn3

+10 −10

Original line number	Diff line number	Diff line
		@@ -126,7 +126,7 @@ module DiameterS9_Gxx_TCFunctions {
		{m_subscription_Id(valueof(m_subscription_Id_Type(END_USER_IMSI_E)),
		valueof(m_subscription_Id_Data(PX_SUBSCRIPTION_ID_DATA)))},
		omit,
		{m_qoSRuleReport_RuleName({m_qoSRuleName_dummy(PX_QOS_RULE_NAME)})}
		{m_qoSRuleReport_RuleName(m_qoSRuleName_dummy(PX_QOS_RULE_NAME))}
		)
		);

		@@ -162,7 +162,7 @@ module DiameterS9_Gxx_TCFunctions {
		{m_subscription_Id(valueof(m_subscription_Id_Type(END_USER_IMSI_E)),
		valueof(m_subscription_Id_Data(PX_SUBSCRIPTION_ID_DATA)))},
		m_called_Station_Id(PX_CALLED_STATION_ID_PDN),
		{m_qoSRuleReport_RuleName({m_qoSRuleName_dummy(PX_QOS_RULE_NAME)})}
		{m_qoSRuleReport_RuleName(m_qoSRuleName_dummy(PX_QOS_RULE_NAME))}
		)
		);

		@@ -198,7 +198,7 @@ module DiameterS9_Gxx_TCFunctions {
		{m_subscription_Id(valueof(m_subscription_Id_Type(END_USER_IMSI_E)),
		valueof(m_subscription_Id_Data(PX_SUBSCRIPTION_ID_DATA)))},
		omit,
		{m_qoSRuleReport_RuleName({m_qoSRuleName_dummy(PX_QOS_RULE_NAME)})}
		{m_qoSRuleReport_RuleName(m_qoSRuleName_dummy(PX_QOS_RULE_NAME))}
		)
		);

		@@ -236,7 +236,7 @@ module DiameterS9_Gxx_TCFunctions {
		{m_subscription_Id(valueof(m_subscription_Id_Type(END_USER_IMSI_E)),
		valueof(m_subscription_Id_Data(PX_SUBSCRIPTION_ID_DATA)))},
		m_called_Station_Id(PX_CALLED_STATION_ID_PDN),
		{m_qoSRuleReport_RuleName({m_qoSRuleName_dummy(PX_QOS_RULE_NAME)})}
		{m_qoSRuleReport_RuleName(m_qoSRuleName_dummy(PX_QOS_RULE_NAME))}
		)
		);

		@@ -611,7 +611,7 @@ module DiameterS9_Gxx_TCFunctions {
		{m_subscription_Id(valueof(m_subscription_Id_Type(END_USER_IMSI_E)),
		valueof(m_subscription_Id_Data(PX_SUBSCRIPTION_ID_DATA)))},
		omit,
		{m_qoSRuleReport_RuleName({m_qoSRuleName_dummy(PX_QOS_RULE_NAME)})}
		{m_qoSRuleReport_RuleName(m_qoSRuleName_dummy(PX_QOS_RULE_NAME))}
		)
		);

		@@ -662,7 +662,7 @@ module DiameterS9_Gxx_TCFunctions {
		{m_subscription_Id(valueof(m_subscription_Id_Type(END_USER_IMSI_E)),
		valueof(m_subscription_Id_Data(PX_SUBSCRIPTION_ID_DATA)))},
		m_called_Station_Id(PX_CALLED_STATION_ID_PDN),
		{m_qoSRuleReport_RuleName({m_qoSRuleName_dummy(PX_QOS_RULE_NAME)})}
		{m_qoSRuleReport_RuleName(m_qoSRuleName_dummy(PX_QOS_RULE_NAME))}
		)
		);

		@@ -977,7 +977,7 @@ module DiameterS9_Gxx_TCFunctions {
		valueof(m_subscription_Id_Data(PX_SUBSCRIPTION_ID_DATA)))},
		{m_anGwAddress(f_IPAdress(PX_SGW_AGW_ipv4,PX_SGW_AGW_ipv6))},
		omit,
		{m_qoSRuleReport_RuleName({m_qoSRuleName_dummy(PX_QOS_RULE_NAME)})}
		{m_qoSRuleReport_RuleName(m_qoSRuleName_dummy(PX_QOS_RULE_NAME))}
		)
		);

		@@ -1015,7 +1015,7 @@ module DiameterS9_Gxx_TCFunctions {
		valueof(m_subscription_Id_Data(PX_SUBSCRIPTION_ID_DATA)))},
		{m_anGwAddress(f_IPAdress(PX_SGW_AGW_ipv4,PX_SGW_AGW_ipv6))},
		m_called_Station_Id(PX_CALLED_STATION_ID_PDN),
		{m_qoSRuleReport_RuleName({m_qoSRuleName_dummy(PX_QOS_RULE_NAME)})}
		{m_qoSRuleReport_RuleName(m_qoSRuleName_dummy(PX_QOS_RULE_NAME))}
		)
		);

		@@ -1103,7 +1103,7 @@ module DiameterS9_Gxx_TCFunctions {
		{m_subscription_Id(valueof(m_subscription_Id_Type(END_USER_IMSI_E)),
		valueof(m_subscription_Id_Data(PX_SUBSCRIPTION_ID_DATA)))},
		omit,
		{m_qoSRuleReport_RuleName({m_qoSRuleName_dummy(PX_QOS_RULE_NAME)})}
		{m_qoSRuleReport_RuleName(m_qoSRuleName_dummy(PX_QOS_RULE_NAME))}
		)
		);

		@@ -1142,7 +1142,7 @@ module DiameterS9_Gxx_TCFunctions {
		{m_subscription_Id(valueof(m_subscription_Id_Type(END_USER_IMSI_E)),
		valueof(m_subscription_Id_Data(PX_SUBSCRIPTION_ID_DATA)))},
		m_called_Station_Id(PX_CALLED_STATION_ID_PDN),
		{m_qoSRuleReport_RuleName({m_qoSRuleName_dummy(PX_QOS_RULE_NAME)})}
		{m_qoSRuleReport_RuleName(m_qoSRuleName_dummy(PX_QOS_RULE_NAME))}
		)
		);

DiameterS9/ttcn/DiameterS9_S9_TCFunctions.ttcn3

+263 −264

File changed.

Preview size limit exceeded, changes collapsed.

DiameterS9/ttcn/DiameterS9_Steps.ttcn3

+35 −8

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@
		import from LibCommon_VerdictControl all ;

		//LibDiameter
		import from LibDiameter_Types_S9_AVPs all;
		import from LibDiameter_Types_Base_AVPs all;
		import from LibDiameter_TypesAndValues all;
		import from LibDiameter_Templates all;
		@@ -58,6 +59,9 @@
		vc_destinationHost := m_destinationHost(PX_DestinationHost);
		vc_destinationRealm := m_destinationRealm(PX_DestinationRealm);

		vc_destinationHost_IUT := m_destinationHost(PX_OriginHost);
		vc_destinationRealm_IUT := m_destinationRealm(PX_OriginRealm);

		vc_hostIPAddress := valueof(f_IPV4or6_String2Address (PX_DIAMETER_S9_ETS_IPADDR));

		vc_send_hopid:=hex2int('00000100'H);
		@@ -292,10 +296,33 @@
		{

		f_awaiting_CCR(mw_CCR_basic(?,
		vc_originHost_IUT,
		vc_originRealm_IUT,
		vc_destinationRealm_IUT,
		mw_cC_Request_Type(INITIAL_REQUEST_E)
		));

		f_send_CCA(m_CCA_basic(vc_sessionId,
		vc_originHost,
		vc_originRealm,
		vc_destinationRealm,
		mw_cC_Request_Type(INITIAL_REQUEST_E)
		m_cC_Request_Type(INITIAL_REQUEST_E),
		m_resultCode(m_resultCode_diameterSuccess)));
		}

		function f_await_initial_subsession_send_response_HPCRF() runs on DiameterComponent
		{

		f_awaiting_CCR(mw_CCR_AnGw_SubSessEnfInf(?,
		vc_originHost_IUT,
		vc_originRealm_IUT,
		vc_destinationRealm_IUT,
		mw_cC_Request_Type(INITIAL_REQUEST_E),
		{mw_subscription_Id(mw_subscription_Id_Type(END_USER_IMSI_E),
		mw_subscription_Id_Data(PX_SUBSCRIPTION_ID_DATA))},
		{mw_anGwAddress(f_IPAdress(PX_SGW_AGW_ipv4,PX_SGW_AGW_ipv6))},
		{mw_subsesEnforcementInfo_Operation(mw_subsessionId_dummy(?),
		mw_subsessionOperation_dummy(Subsession_Operation_Code:ESTABLISHMENT_E),
		*)}
		));

		f_send_CCA(m_CCA_basic(vc_sessionId,
		@@ -386,8 +413,8 @@
		f_awaiting_RAA(mw_RAA_dummy);

		f_awaiting_CCR(mw_CCR_basic(?,
		vc_originHost,
		vc_originRealm,
		vc_originHost_IUT,
		vc_originRealm_IUT,
		vc_destinationRealm,
		mw_cC_Request_Type(TERMINATION_REQUEST_E)
		));
		@@ -402,9 +429,9 @@
		function f_await_session_termination_HPCRF() runs on DiameterComponent
		{
		f_awaiting_CCR(mw_CCR_basic(?,
		vc_originHost,
		vc_originRealm,
		vc_destinationRealm,
		vc_originHost_IUT,
		vc_originRealm_IUT,
		vc_destinationRealm_IUT,
		mw_cC_Request_Type(TERMINATION_REQUEST_E)
		));

DiameterS9/ttcn/DiameterS9_Templates.ttcn

+98 −74

File changed.

Preview size limit exceeded, changes collapsed.

DiameterS9/ttcn/DiameterS9_TestCases.ttcn

+2 −2

Original line number	Diff line number	Diff line
		@@ -1045,7 +1045,7 @@ module DiameterS9_TestCases

		// Finish
		f_ConfigRun_HPCRF_BBERF(v_diameterComponent_hpcrf, v_diameterComponent_bberf,
		{c_prDone, c_sync1, c_tbDone, c_poDone});
		{c_prDone, c_tbDone, c_poDone});

		} // end TC_VPCEF_HST_03

		@@ -1070,7 +1070,7 @@ module DiameterS9_TestCases

		// Finish
		f_ConfigRun_HPCRF_BBERF(v_diameterComponent_hpcrf, v_diameterComponent_bberf,
		{c_prDone, c_sync1, c_tbDone, c_poDone});
		{c_prDone, c_tbDone, c_poDone});

		} // end TC_VPCEF_HST_04