Commit c8a7d408 authored by schmitting's avatar schmitting
Browse files

End of validation week 23

parent bb492043
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ module LibDiameter_Interface
    import from LibCommon_DataStrings all;
    //LibDiameter
    import from LibDiameter_TypesAndValues all;
    import from LibDiameter_PIXITS all;
    
    type port LowerLayerPPort message {
          inout Lower_Layer_Primitive}; //LLP 
@@ -56,7 +57,7 @@ module LibDiameter_Interface
      var template Media_Component_Description_AVP vc_mediaComponentDescription;
        
      //general timers
      timer tc_wait  := 5.0;  // define PIXIT if needed
      timer tc_wait  := PX_DIAMETER_TWAIT;
      timer tc_delay := 1.0;  // delay next Request
  		
      // variables for storing default references
+9 −0
Original line number Diff line number Diff line
@@ -26,4 +26,13 @@ module LibDiameter_PIXITS

	} //group Diameter_PIXITparameters

	
    group DiameterTimers {
	
        /** @desc	float for TWait default value for waiting an operator action
        */
        modulepar float        PX_DIAMETER_TWAIT := 30.0;
	
    }
  
} // end module LibDiameter_PIXITS
 No newline at end of file
+22 −5
Original line number Diff line number Diff line
@@ -274,6 +274,23 @@ module LibDiameter_Templates {
                aVP_vid := p_avpVid
            }

			
            /**
             * @desc complete AVP header field template
             * @param p_avpCode specific Code of the AVP parameter
             * @param p_avpDataLen additional length caused if AVP data field is present
             * @param p_avpVid vendor id if needed
             */
               template AVP_Header m_aVP_HeaderVid_Mbit0(AVP_Code p_avpCode, AVP_Length p_avpDataLen, template AVP_Vendor_ID p_avpVid) := {
                   aVP_Code := p_avpCode,
                   aVP_flags := {v_bit := f_aVPvBit(p_avpVid),
                       m_bit := '0'B,
                       p_bit := '0'B,
                       reserved_bits := '00000'B},
                   aVP_len :=f_aVP_len(8, p_avpDataLen, p_avpVid), // add length of avpData and optional 4 (if Vid is present)
                   aVP_vid := p_avpVid
               }
            
            function f_aVP_len(AVP_Length p_length8, AVP_Length p_avpDataLen, template AVP_Vendor_ID p_avpVid)return AVP_Length  {
            	var AVP_Length v_sum;
            	v_sum := p_length8 + p_avpDataLen + f_lengthVid(p_avpVid);
@@ -496,7 +513,7 @@ module LibDiameter_Templates {
            }  
                  
            template Auth_Application_Id_AVP mw_authApplicationId(UInt32 p_avpData) := {
            	aVP_Header := mw_aVP_Header(c_auth_Application_Id_AVP_Code),
            	aVP_Header := mw_aVP_Header(c_result_Code_AVP_Code),
            	aVP_Data := p_avpData
            }
                    
@@ -541,7 +558,7 @@ module LibDiameter_Templates {
			}
            
            template Product_Name_AVP m_productName(template(value) universal charstring p_avpData) := {
                aVP_Header := m_aVP_HeaderVid(c_product_Name_AVP_Code, lengthof(p_avpData), omit),
                aVP_Header := m_aVP_HeaderVid_Mbit0(c_product_Name_AVP_Code, lengthof(p_avpData), omit),
                aVP_Data := p_avpData
            }
            
@@ -1018,7 +1035,7 @@ module LibDiameter_Templates {
            	origin_Host := ?,
            	origin_Realm := ?,
            	destination_Realm := ?,
            	destination_Host := ?,
            	destination_Host := *,
            	auth_Application_Id := ?,
            	af_Application_Id := *,
            	media_Component_Description := *,
@@ -2174,7 +2191,7 @@ module LibDiameter_Templates {
      	group basic_request_templates_receive {

            template CER_MSG mw_CER_basic(template Auth_Application_Id_AVP p_authApplicationId) modifies mw_CER_dummy := {
                auth_Application_Id := {p_authApplicationId,*}
                auth_Application_Id := {p_authApplicationId}
			}

        }//end group basic_request_templates_receive
+1 −1
Original line number Diff line number Diff line
@@ -6285,7 +6285,7 @@ group BasicTypesAndConstants{
                    Origin_Host_AVP                     origin_Host,//required
                    Origin_Realm_AVP                     origin_Realm,
                    Destination_Realm_AVP                destination_Realm,
                    Destination_Host_AVP                destination_Host,
                    Destination_Host_AVP                destination_Host optional,
                    Auth_Application_Id_AVP                auth_Application_Id,
                    AF_Application_Identifier_AVP       af_Application_Id optional,//present in ETSI TS 129 214 p.5.6.7
                    set of Media_Component_Description_AVP media_Component_Description optional,