Commit f64bb254 authored by rennoch's avatar rennoch
Browse files

corrections due to testcast compilation

parent 793490a2

DiameterGx/ttcn/DiameterGx_Gx_TCFunctions.ttcn

+2996 −2996
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ module DiameterGx_Gx_TCFunctions { 
                f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); // sync

		

                f_send_CCR(m_CCR_InitialRequest_SubID_LogID_PhyID(vc_sessionId, vc_originHost, vc_originRealm, vc_destinationRealm, 

                                    {m_subscription_Id(m_subscription_Id_Type(PX_SUBSCRIPTION_ID_TYPE),m_subscription_Id_Data(PX_SUBSCRIPTION_ID_DATA))}, 

                                    {m_subscription_Id(valueof(m_subscription_Id_Type(PX_SUBSCRIPTION_ID_TYPE)),valueof(m_subscription_Id_Data(PX_SUBSCRIPTION_ID_DATA)))}, 

                                    m_logicalAccessID(PX_Logical_Access_ID), 

                                    m_physicalAccessID(PX_Physical_Access_ID) ));
@@ -277,7 +277,7 @@ module DiameterGx_Gx_TCFunctions { 
								vc_originHost, 

								vc_originRealm, 

								vc_destinationRealm,

								m_pFInfo_Precedence_pFContent(m_precedence(PX_PRECEDENCE_DATA),m_packet_Filter_Content(m_iPFilterRule)),

								m_pFInfo_Precedence_pFContent(valueof(m_precedence(PX_PRECEDENCE_DATA)),valueof(m_packet_Filter_Content(valueof(m_iPFilterRule)))),

								m_packet_Filter_Operation(ADDITION_E),

								m_qoS_Information_ClassIdentifier(QCI_1_E)								

								));
@@ -314,7 +314,7 @@ module DiameterGx_Gx_TCFunctions { 
								vc_originHost, 

								vc_originRealm, 

								vc_destinationRealm,

								m_pFInfo_PacketFilterId_FlowDirection(m_packet_Filter_Identifier(PX_PACKET_FILTER_IDENTIFIER_DATA)),

								m_pFInfo_PacketFilterId_FlowDirection(valueof(m_packet_Filter_Identifier(PX_PACKET_FILTER_IDENTIFIER_DATA))),

								m_packet_Filter_Operation(MODIFICATION_E),

								omit								

								));
@@ -351,7 +351,7 @@ module DiameterGx_Gx_TCFunctions { 
								vc_originHost, 

								vc_originRealm, 

								vc_destinationRealm,

								m_pFInfo_PacketFilterId(m_packet_Filter_Identifier(PX_PACKET_FILTER_IDENTIFIER_DATA)),

								m_pFInfo_PacketFilterId(valueof(m_packet_Filter_Identifier(PX_PACKET_FILTER_IDENTIFIER_DATA))),

								m_packet_Filter_Operation(DELETION_E),

								omit								

								));

DiameterGx/ttcn/DiameterGx_Templates.ttcn

+17 −17
Original line number Diff line number Diff line
@@ -474,8 +474,8 @@ module DiameterGx_Templates { 
                

            template Routing_Filter_AVP m_routing_Filter :=

            {

                aVP_Header := m_aVP_HeaderVid_Mbit0(c_routing_Filter_AVP_Code, 12/*12-flow_direction*/+ lengthof(encvalue(m_flow_Description(m_iPFilterRule)))/8, c_vendId3gpp),

                flow_Description := m_flow_Description(m_iPFilterRule),

                aVP_Header := m_aVP_HeaderVid_Mbit0(c_routing_Filter_AVP_Code, 12/*12-flow_direction*/+ lengthof(encvalue(m_flow_Description(valueof(m_iPFilterRule))))/8, c_vendId3gpp),

                flow_Description := m_flow_Description(valueof(m_iPFilterRule)),

                flow_Direction := m_flowDirection_Bidirectional,

                toS_Traffic_Class := omit,

                security_Parameter_Index := omit,
@@ -1414,7 +1414,7 @@ module DiameterGx_Templates { 
                                        template Destination_Realm_AVP p_destinationRealm,

            							template Framed_IP_Address_AVP p_framedIpAddress,

            							template Framed_IPv6_Prefix_AVP p_framedIp6Address) modifies m_CCR_basic := {

                subscription_Id := {m_subscription_Id(m_subscription_Id_Type(PX_SUBSCRIPTION_ID_TYPE),m_subscription_Id_Data(PX_SUBSCRIPTION_ID_DATA))},

                subscription_Id := {m_subscription_Id(valueof(m_subscription_Id_Type(PX_SUBSCRIPTION_ID_TYPE)),valueof(m_subscription_Id_Data(PX_SUBSCRIPTION_ID_DATA)))},

                framed_IP_Address := p_framedIpAddress,

                framed_IPv6_Prefix := p_framedIp6Address,

                iP_CAN_Type := m_iP_CAN_Type(PX_IP_CAN_TYPE),
@@ -1434,8 +1434,8 @@ module DiameterGx_Templates { 
				pDN_Connection_ID := m_pDN_Connection_ID(PX_PDN_CONNECTION_ID_DATA),

				bearer_Usage := m_bearer_Usage(PX_BEARER_USAGE_DATA),

				access_Network_Charging_Address := m_accessNetworkChargingAddress(f_IPAdress(PX_ANCA_ipv4, PX_ANCA_ipv6)),

				access_Network_Charging_Identifier_Gx := {m_aNCI_Gx(m_aNCI_Value(PX_ACCESS_NETWORK_CHARGING_IDENTIFIER_VALUE))},

				routing_Rule_Install := m_routing_Rule_Install(m_routing_Rule_Definition(m_routing_Rule_Identifier(PX_ROUTING_RULE_IDENTIFIER_VALUE),m_routing_Filter))

				access_Network_Charging_Identifier_Gx := {m_aNCI_Gx(valueof(m_aNCI_Value(PX_ACCESS_NETWORK_CHARGING_IDENTIFIER_VALUE)))},

				routing_Rule_Install := m_routing_Rule_Install(valueof(m_routing_Rule_Definition(valueof(m_routing_Rule_Identifier(PX_ROUTING_RULE_IDENTIFIER_VALUE)),valueof(m_routing_Filter))))

 			}

 			

 			template CCR_MSG m_CCR_InitialRequest_NetworkRequestSupport(template Session_Id_AVP p_sessionId,
@@ -1481,7 +1481,7 @@ module DiameterGx_Templates { 
                                        template Destination_Realm_AVP p_destinationRealm) modifies m_CCR_basic := {

                cC_Request_Type := m_cC_Request_Type(UPDATE_REQUEST_E),

                cC_Request_Number := m_cC_Request_Number(1),

                charging_Rule_Report := {m_chargRuleReport_RNameStatus(m_chargingRuleName(PX_CHARGING_RULE_NAME_DATA),m_pCC_Rule_Status(PX_PCC_RULE_STATUS))}, 

                charging_Rule_Report := {m_chargRuleReport_RNameStatus(valueof(m_chargingRuleName(PX_CHARGING_RULE_NAME_DATA)),valueof(m_pCC_Rule_Status(PX_PCC_RULE_STATUS)))}, 

                event_Trigger := {m_event_Trigger(IP_CAN_CHANGE_E)}

            }
@@ -1499,8 +1499,8 @@ module DiameterGx_Templates { 
                                        template Origin_Realm_AVP p_originRealm,

                                        template Destination_Realm_AVP p_destinationRealm) modifies m_CCR_UpdateRequest := {

				access_Network_Charging_Address := m_accessNetworkChargingAddress(f_IPAdress(PX_ANCA_ipv4, PX_ANCA_ipv6)),

				access_Network_Charging_Identifier_Gx := {m_aNCI_Gx(m_aNCI_Value(PX_ACCESS_NETWORK_CHARGING_IDENTIFIER_VALUE))},

				routing_Rule_Install := m_routing_Rule_Install(m_routing_Rule_Definition(m_routing_Rule_Identifier(PX_ROUTING_RULE_IDENTIFIER_VALUE),m_routing_Filter))

				access_Network_Charging_Identifier_Gx := {m_aNCI_Gx(valueof(m_aNCI_Value(PX_ACCESS_NETWORK_CHARGING_IDENTIFIER_VALUE)))},

				routing_Rule_Install := m_routing_Rule_Install(valueof(m_routing_Rule_Definition(valueof(m_routing_Rule_Identifier(PX_ROUTING_RULE_IDENTIFIER_VALUE)),valueof(m_routing_Filter))))

 			}

            

            template CCR_MSG m_CCR_UpdateRequest_UERequestForAllocResources(template Session_Id_AVP p_sessionId,
@@ -1531,9 +1531,9 @@ module DiameterGx_Templates { 
                                        template Destination_Realm_AVP p_destinationRealm) modifies m_CCR_basic := {

                cC_Request_Type := m_cC_Request_Type(UPDATE_REQUEST_E),

                cC_Request_Number := m_cC_Request_Number(1),

                charging_Rule_Report := {m_chargRuleReport_RNameStatusFailure(m_chargingRuleName('111111'O),//failed PCC rule

                    														m_pCC_Rule_Status(ACTIVE_E),

                    														m_rule_Failure_Code(PX_RULE_FAILURE_CODE))}, 

                charging_Rule_Report := {m_chargRuleReport_RNameStatusFailure(valueof(m_chargingRuleName('111111'O)),//failed PCC rule

                    														valueof(m_pCC_Rule_Status(ACTIVE_E)),

                    														valueof(m_rule_Failure_Code(PX_RULE_FAILURE_CODE)))}, 

                event_Trigger := {m_event_Trigger(IP_CAN_CHANGE_E)}

            }
@@ -1543,7 +1543,7 @@ module DiameterGx_Templates { 
                                        template Destination_Realm_AVP p_destinationRealm,

            							template Framed_IP_Address_AVP p_framedIpAddress,

            							template Framed_IPv6_Prefix_AVP p_framedIp6Address) modifies m_CCR_basic := {

                subscription_Id := {m_subscription_Id(m_subscription_Id_Type(PX_SUBSCRIPTION_ID_TYPE),m_subscription_Id_Data(PX_SUBSCRIPTION_ID_DATA))},

                subscription_Id := {m_subscription_Id(valueof(m_subscription_Id_Type(PX_SUBSCRIPTION_ID_TYPE)),valueof(m_subscription_Id_Data(PX_SUBSCRIPTION_ID_DATA)))},

                framed_IP_Address := p_framedIpAddress,

                framed_IPv6_Prefix := p_framedIp6Address,

                iP_CAN_Type := m_iP_CAN_Type(PX_IP_CAN_TYPE),
@@ -1558,9 +1558,9 @@ module DiameterGx_Templates { 
                                        template Destination_Realm_AVP p_destinationRealm) modifies m_CCR_basic := {

                cC_Request_Type := m_cC_Request_Type(UPDATE_REQUEST_E),

                cC_Request_Number := m_cC_Request_Number(1),

                charging_Rule_Report := {m_chargRuleReport_RNameStatusFailure(m_chargingRuleName(PX_CHARGING_RULE_NAME_DATA),

                    														m_pCC_Rule_Status(INACTIVE_E),

                    														m_rule_Failure_Code(RESOURCE_ALLOCATION_FAILURE_E))}

                charging_Rule_Report := {m_chargRuleReport_RNameStatusFailure(valueof(m_chargingRuleName(PX_CHARGING_RULE_NAME_DATA)),

                    														valueof(m_pCC_Rule_Status(INACTIVE_E)),

                    														valueof(m_rule_Failure_Code(RESOURCE_ALLOCATION_FAILURE_E)))}

            }

            

            template CCR_MSG m_CCR_TerminationRequest(template Session_Id_AVP p_sessionId,