Commit fd0cd9db authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge branch 'STF574' of https://forge.etsi.org/rep/vxlte/vxlte-iop into STF574

parents 98f8f529 3023c91d
Loading
Loading
Loading
Loading

.gitignore

deleted100644 → 0
+0 −7
Original line number Original line Diff line number Diff line
.project
.settings
.classpath
.metadata

/ttcn3build/
/ttcn/LibSip/xsd/*.ttcn3view
+208 −2
Original line number Original line Diff line number Diff line
@@ -83,6 +83,170 @@ module AtsImsIot_Diameter_Templates {
                aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_cC_Request_Type_AVP_Code),
                aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_cC_Request_Type_AVP_Code),
                aVP_Data := p_avpData
                aVP_Data := p_avpData
            }
            }
            
            template QoS_Information_AVP mw_qoS_Information :=
            {
                aVP_Header                    := ?,
                qoS_Class_Identifier          := *,
                max_Requested_Bandwidth_UL    := *,
                max_Requested_Bandwidth_DL    := *,
                guaranteed_Bitrate_UL         := *,
                guaranteed_Bitrate_DL         := *,
                bearer_Identifier             := ?,
                allocation_Retention_Priority := *,
                aPN_Aggregate_Max_Bitrate_UL  := ?,
                aPN_Aggregate_Max_Bitrate_DL  := ?,
                aVP_Type                      := *
            }
            
            template QoS_Information_AVP mw_qoS_Information_Audio :=
            {
            	aVP_Header                    := ?,
                qoS_Class_Identifier          := mw_QoS_Class_Identifier(QCI_1_E),
                max_Requested_Bandwidth_UL    := ?,
                max_Requested_Bandwidth_DL    := ?,
                guaranteed_Bitrate_UL         := ?,
                guaranteed_Bitrate_DL         := ?,
                bearer_Identifier             := *,
                allocation_Retention_Priority := ?,
                aPN_Aggregate_Max_Bitrate_UL  := *,
                aPN_Aggregate_Max_Bitrate_DL  := *,
                aVP_Type                      := *
            }
            
            template QoS_Information_AVP mw_qoS_Information_Video :=
            {
                aVP_Header                    := ?,
                qoS_Class_Identifier          := mw_QoS_Class_Identifier(QCI_2_E),
                max_Requested_Bandwidth_UL    := ?,
                max_Requested_Bandwidth_DL    := ?,
                guaranteed_Bitrate_UL         := ?,
                guaranteed_Bitrate_DL         := ?,
                bearer_Identifier             := *,
                allocation_Retention_Priority := ?,
                aPN_Aggregate_Max_Bitrate_UL  := *,
                aPN_Aggregate_Max_Bitrate_DL  := *,
                aVP_Type                      := *
            }
            
            template Default_EPS_Bearer_QoS_AVP mw_default_EPS_Bearer_QoS_Class_5 :=
            {
                aVP_Header                        := ?,
                qoS_Class_Identifier              := mw_QoS_Class_Identifier(QCI_5_E),
                allocation_Retention_Priority     := mw_allocation_Retention_Priority,
                aVP_Type                          := *
            }
            
            template Allocation_Retention_Priority_AVP mw_allocation_Retention_Priority :=
            {
                aVP_Header                        := ?,
                priority_Level                    := ?,
                pre_emption_Capability            := ?,
                pre_emption_Vulnerability         := ?
            }
            
            template QoS_Class_Identifier_AVP mw_QoS_Class_Identifier(template QoS_Class_Identifier p_avp_Data) :=
            {
                aVP_Header            := ?,
                aVP_Data              := p_avp_Data
            }

            template Bearer_Usage_AVP mw_bearer_Usage(Bearer_Usage p_avpData) :=
            {
                aVP_Header := ?,
                aVP_Data   := p_avpData
            }

            template Subscription_Id_AVP mw_subscription_Id(template Subscription_Id_Type_AVP p_typeAVP):=
            {
                aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_subscription_Id_AVP_Code),
                subscription_Id_Type := p_typeAVP,
                subscription_Id_Data := ?
            }

            template Subscription_Id_Type_AVP mw_subscription_Id_Type(template Subscription_Id_Ty_Type p_avpData):=
            {
                aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_subscription_Id_Type_AVP_Code),
                aVP_Data := p_avpData
            }

            template Charging_Rule_Install_AVP mw_chrgRuleInstall :=
            {
                aVP_Header := mw_aVP_Header_VMbit1(c_charging_Rule_Install_AVP_Code),
                charging_Rule_Definition := {mw_chrgRuleDefinition_RuleName_Flows_FlowStatus},
                charging_Rule_Name := *,
                charging_Rule_Base_Name := *,
                bearer_Identifier := *,
                rule_Activation_Time := *,
                rule_DeActivation_Time := *,
                resource_Allocation_Notification := *,
                charging_Correlation_Indicator := *,
                aVP_Type := *
            }

            template Charging_Rule_Install_AVP mw_chrgRuleInstall_Qos :=
            {
                aVP_Header := mw_aVP_Header_VMbit1(c_charging_Rule_Install_AVP_Code),
                charging_Rule_Definition := {mw_chrgRuleDefinition_RuleName_Flows_FlowStatus_Qos},
                charging_Rule_Name := *,
                charging_Rule_Base_Name := *,
                bearer_Identifier := *,
                rule_Activation_Time := *,
                rule_DeActivation_Time := *,
                resource_Allocation_Notification := *,
                charging_Correlation_Indicator := *,
                aVP_Type := *
            }

            template Charging_Rule_Remove_AVP mw_chrgRuleRemove_Name :=
            {
                aVP_Header := mw_aVP_Header_VMbit1(c_charging_Rule_Remove_AVP_Code),
                charging_Rule_Name := ?,
                charging_Rule_Base_Name := *,
                aVP_Type := *
            }

            template Charging_Rule_Definition_AVP mw_chrgRuleDefinition_RuleName_Flows_FlowStatus :=
            {
                aVP_Header := mw_aVP_Header_VMbit1(c_charging_Rule_Definition_AVP_Code),
                charging_Rule_Name := ?,
                service_Identifier := *,
                rating_Group := *,
                flow_Information := *,
                flow_Status := mw_flowStatus(ENABLED_E),
                qoS_Information := *,
                reporting_Level := *,
                online := *,
                offline := *,
                metering_Method := *,
                precedence := *,
                aF_Charging_Identifier := *,
                flows := {mw_flows},
                monitoring_Key := *,
                aF_Signalling_Protocol := *,
                sponsor_Identity := *,
                application_Service_Provider_Identity := *,
                aVP_Type := *
            }

            template Charging_Rule_Definition_AVP mw_chrgRuleDefinition_RuleName_Flows_FlowStatus_Qos modifies mw_chrgRuleDefinition_RuleName_Flows_FlowStatus:=
            {
                flow_Information := ?,
                flow_Status := ?,
                qoS_Information := (mw_qoS_Information_Audio,mw_qoS_Information_Video)
            }
            
            template Flows_AVP mw_flows :=
            {
                aVP_Header := ?,//<AVP header: 510 ....>
                media_component_number := 
                    {aVP_Header := ?,//<AVP header: 518 ....>
                     aVP_Data   := 0
                    },//Media_Component_Number_AVP    
                flow_Number := *,
                final_unit_action := *
             }
            
        } //end group GxHeaderFields
        } //end group GxHeaderFields
    } //end DiameterHeaderFields
    } //end DiameterHeaderFields
    group DiameterTemplates {
    group DiameterTemplates {
@@ -135,6 +299,34 @@ module AtsImsIot_Diameter_Templates {
                    }
                    }
                }
                }
                
                
                template CCR_MSG mw_CCR_SubscriberIMSI_qosInformation_class5(CC_Request_Ty_Type p_avpData) modifies mw_CCR_dummy := {
                    cCR_Body :={
                        cC_Request_Type        := mw_cC_Request_Type(p_avpData),
                        subscription_Id        := {mw_subscription_Id(mw_subscription_Id_Type(END_USER_IMSI_E))},
                        iP_CAN_Type            := ?,
                        rat_Type               := ?,
                        called_Station_Id      := ?,
                        pDN_Connection_ID      := ?,
                        framed_IP_Address      := ?,
                        //framed_IPv6_Prefix     := *,
                        bearer_Usage           := mw_bearer_Usage(IMS_SIGNALLING_E),
                        qoS_Information        := mw_qoS_Information,
                        default_EPS_Bearer_QoS := mw_default_EPS_Bearer_QoS_Class_5
                    }
                }

                template RAR_MSG mw_RAR_ChargingRuleInstall(template Charging_Rule_Install_AVP p_Charging_Rule_Install) modifies mw_RAR_dummy := {
                    rAR_Body :={
                        charging_Rule_Install := {p_Charging_Rule_Install}
                    }
                }

                template RAR_MSG mw_RAR_ChargingRuleRemove modifies mw_RAR_dummy := {
                    rAR_Body :={
                        charging_Rule_Remove := {mw_chrgRuleRemove_Name}
                    }
                }
            
            }// end group GxRequestMessageTemplates
            }// end group GxRequestMessageTemplates
            group GxAnswertMessageTemplates{
            group GxAnswertMessageTemplates{
                
                
@@ -143,6 +335,20 @@ module AtsImsIot_Diameter_Templates {
                        result_Code := mw_resultCode(mw_resultCode_diameterSuccess)
                        result_Code := mw_resultCode(mw_resultCode_diameterSuccess)
                    }
                    }
                }
                }
                
                template CCA_MSG mw_CCA_qosInformation_class5 modifies mw_CCA_dummy := {
                    cCA_Body :={
                        result_Code            := mw_resultCode(mw_resultCode_diameterSuccess),
                        qoS_Information        := {mw_qoS_Information},
                        default_EPS_Bearer_QoS := mw_default_EPS_Bearer_QoS_Class_5
                    }
                }
                
                template RAA_MSG mw_RAA_resultCode modifies mw_RAA_dummy := {
                    rAA_Body :={
                        result_Code := mw_resultCode(mw_resultCode_diameterSuccess)
                    }
                }
            }// end group GxRequestMessageTemplates
            }// end group GxRequestMessageTemplates
        }//end group GxMessageTemplates
        }//end group GxMessageTemplates
    } // end group DiameterTemplates
    } // end group DiameterTemplates
+636 −0

File changed.

Preview size limit exceeded, changes collapsed.

+1168 −364

File changed.

Preview size limit exceeded, changes collapsed.

+1 −0
Original line number Original line Diff line number Diff line
@@ -84,6 +84,7 @@ module LibIot_TypesAndValues {
	 */ 
	 */ 
	type record MonitorInterfaceInfo {
	type record MonitorInterfaceInfo {
	   charstring interfaceName,
	   charstring interfaceName,
	   boolean available optional,//or would be better MonitorEnable
	   InterfaceInfo interfaceInfo	
	   InterfaceInfo interfaceInfo	
	}
	}