Commit 3b4c28de authored by fischerjo's avatar fischerjo
Browse files

ATSP ToDo No. 3, 12-23, 55, 56

parent 5f0ca54d
Loading
Loading
Loading
Loading
+58 −11
Original line number Diff line number Diff line
@@ -56,13 +56,9 @@ module LibItsAtsp_Functions {
         * @desc Brings the IUT into an initial state.
         */
        function f_initialState() runs on ItsCalm {
            if (PICS_ITS_MGT_NOT == true) {
                f_utInitializeIut(m_utAtspInitialize_with_management);
            } else { 
                f_utInitializeIut(m_utAtspInitialize_without_management);
            } // FIXME Add suport of PICS_FSAP_FNTP
            f_utInitializeIut(m_utAtspInitialize);
            f_cfInitialize(m_cfAtspInitialize);
            f_sleepIgnoreDef(PX_WAIT_FOR_IUT_READY); // Wait until the IUT is in a stable situation (beaconing...)
            f_sleepIgnoreDef(PX_WAIT_FOR_IUT_READY); // Wait until the IUT is in a stable situation 
            cfPort.clear; // Because TestConfigIICP should trigger management port deletion message 
        } // End of function f_initialState

@@ -132,7 +128,7 @@ module LibItsAtsp_Functions {
            // Unmap
            unmap(self:acPort, system:acPort);
            unmap(self:utPort, system:utPort);
            unmap(self:cfPort, system:cfPort); // FIXME Add check PICS_ITS_MGT_NOT
            unmap(self:cfPort, system:cfPort); 
            unmap(self:fsapPort, system:fsapPort);
            
            // Disconnect
@@ -426,7 +422,7 @@ module LibItsAtsp_Functions {
														f_getNextCommandRef(), 
														p_newState));
			
			f_cnAwaitEventNotificationCI(mw_miLinkIndAny, mw_miEvent21218_5(
			f_cnAwaitEventNotificationCI(p_linkID, mw_miEvent21218_5(
																		mw_miCIStatusParam(p_expectedStatus)), p_discard);
		} // End of function f_cnTriggerStateChangeAndWaitCI
	
@@ -610,15 +606,66 @@ module LibItsAtsp_Functions {
	            [] cfPort.receive(CfEventInd : { cfAtspEventInd := ? } ) -> value v_result { 
                    tc_wait.stop;
                    log("*** f_cnGetCiStatusParameterValueCI: ERROR: An unexpected MI-COMMAND was received ***", v_result);
	                f_selfOrClientSyncAndVerdict("error", e_timeout); // to be checked
	                repeat;
	            }
	            [] tc_wait.timeout {
                    log("*** f_cnGetCiStatusParameterValueCI: ERROR: Timeout while waiting for event check result ***");
                    f_selfOrClientSyncAndVerdict("error", e_timeout); // to be checked
                    f_selfOrClientSyncAndVerdict("error", e_timeout);
	            }
	        } // End of 'alt' statement
			return v_ciStatus;
		}// End of function f_cnGetCiStatusParameterValueCI
		

		/**
         * @desc Test addressability of CI using Get current CiStatus IParameter value
         * @param   p_linkID    Link-ID used by IUT
		 * @return  The CIstatus value returned 
         */
		function f_cnTestGetCiStatusParameterValueNoReplyExpected( 
            in template Link_ID p_linkID	
        ) runs on ItsCalm {
			//local variable(s)
			var template CfEvent v_getCIparam;
			var template CfEventInd v_cfGetCiStatusValue;
			var CIstatus v_ciStatus;
			var CfEventInd v_result;
			var CommandRef v_commandRef := f_getNextCommandRef();
			
			v_getCIparam := m_cfAtspGetReqEvent(
								m_miGetRequest(
									p_linkID,
									v_commandRef,
									{ c_ciIParamNoCiStatus }
								)
							);
			cfPort.send(v_getCIparam);
			
			v_cfGetCiStatusValue := mw_cfAtspEventIndGetConf(
										mw_miGetConfirm(p_linkID, v_commandRef, {
											{
												paramNo := c_ciIParamNoCiStatus,
												parameter := {
													CIstatus := ?
												}
											}
										}));
			log("*** f_cnTestGetCiStatusParameterValueNoReplyExpected: INFO: MI-Get.request sent", v_getCIparam, " ***");
	        tc_ac.start;
	        alt {
	            [] cfPort.receive(v_cfGetCiStatusValue){
	                tc_ac.stop;
	                log("*** f_cnTestGetCiStatusParameterValueNoReplyExpected: ERROR: Unexpected 'MI-Get.confirm' received ***");
					f_selfOrClientSyncAndVerdict("error", e_error);
	            }
	            [] tc_ac.timeout {
                    log("*** f_cnTestGetCiStatusParameterValueNoReplyExpected: INFO: Expected Timeout ***");
                    f_selfOrClientSyncAndVerdict("expected timeout", e_success);
	            }
	        } // End of 'alt' statement
		}// End of function f_cnTestGetCiStatusParameterValueNoReplyExpected
		
		
	}

	group atspAltsteps {
+1 −6
Original line number Diff line number Diff line
@@ -215,12 +215,7 @@ module LibItsAtsp_Pics {
        modulepar boolean PICS_WAKEUP := false;
		
		/**
         * @desc Is IUT support notification to the ITS Management layer
         */
        modulepar boolean PICS_ITS_MGT_NOT := false;
		
		/**
		 * @desc Are IN-DATAUNIT-Indications acknowledged by IN-DATAUNIT-STATUSS
		 * @desc Is IUT supporting the IN-UNITDATA-STATUS service primitive?
		 */
		modulepar boolean PICS_IN_UNITDATA_STATUS := false;

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ module LibItsAtsp_Pixits {
	/**
     * @desc Expected MedType of the IUT CI
     * @see ISO 21218 - Clause 6.3 Link Identifier 
	 * ISO 21215 (802.11): 5
     */
    modulepar MedID PX_CI_MED_TYPE := 5;
	
@@ -43,7 +44,7 @@ module LibItsAtsp_Pixits {
	modulepar VCIserialNumber PX_VCI_SERIAL_NUMBER := 0;
	
	/**
     * Wait until the IUT is in a stable situation (beaconing...)
     * Wait until the IUT is in a stable situation
     */
    modulepar float PX_WAIT_FOR_IUT_READY := 1.0;

+891 −877
Original line number Diff line number Diff line
@@ -566,7 +566,6 @@ module LibItsAtsp_Templates {
					commandRef := p_commandRef, 
					errStatus := p_errorStatus
               	} // End of template m_miCommandConfirm

				/**
               	* @desc Generic receive template for MI-COMMAND.confirm service primitive
               	*/
@@ -609,7 +608,6 @@ module LibItsAtsp_Templates {
					ref := p_ref,
					request_param := p_requestParam
               	} // End of template m_miRequestRequest

				/**
               	* @desc Generic receive template for MI-REQUEST.request service primitive
               	*/
@@ -893,7 +891,6 @@ module LibItsAtsp_Templates {
                   	linkID := p_linkId, 
                   	commandRef := p_commandRef, 
                   	set_param := p_setParam
                	
			    } // End of template m_miGetRequest
					
				/**
@@ -952,7 +949,6 @@ module LibItsAtsp_Templates {
                   	linkID := p_linkId, 
                   	commandRef := p_commandRef, 
                   	set_param := p_errors
                	
				} // End of template m_miSetConfirm

	            /**
@@ -972,47 +968,32 @@ module LibItsAtsp_Templates {

	} // end of group miSapPrimitives
	
	
	group atspPrimitives {    
	group atspInitPrimitives {    
        /**
         * @desc Templates used to 
         * <li>trigger message on Upper Tester</li>
         * <li>capture indication message sent by the IUT</li>
         */
        group utPrimitives {
            template (value) UtInitialize m_utAtspInitialize_with_management := { 
                utAtspInitialize := { 
                    mcmdRq := { 
                        mCmdRef := 255, 
                        mcmd := { 
                            TestConfigIICP := { 
                                location := PX_LOC_ITS_ATSP_ACCESS_SETTINGS_MX_SAP_SET, 
                                lowerLayers := PX_IUT_LOWER_LAYER_USED,
                                testMode := PX_IUT_TEST_MODE_ON 
                            } 
                        } // End of field 'mcmd' 
                    } // End of field 'mcmdRq'
                } // End of field 'utFntpInitialize' 
            } // End of template m_utFntpInitialize 

            /**
             * @desc Initializes the ATSP IUT without support notification to the Management entity
             * @desc Initializes the SUT for ATSP testing 
             * See Test System Configuration Access to SUT
             */
            template (value) UtInitialize m_utAtspInitialize_without_management := { 
			template (value) UtInitialize m_utAtspInitialize := { 
                utAtspInitialize := { 
                    mcmdRq := { 
                        mCmdRef := 255, 
                        mcmd := { 
                            TestConfigIICP := { 
                                location := PX_LOC_ITS_ATSP_ACCESS_SETTINGS_MX_SAP_SET, 
                                location := '100000'B, // PX_LOC_ITS_ATSP_ACCESS_SETTINGS_MX_SAP_SET, 
                                lowerLayers := PX_IUT_LOWER_LAYER_USED,
                                testMode := PX_IUT_TEST_MODE_ON 
                            } 
                        } // End of field 'mcmd' 
                    } // End of field 'mcmdRq'
                } // End of field 'utFntpInitialize' 
            } // End of template m_utFntpInitialize 
                } // End of field 'utAtspInitialize' 
            } // End of template m_utAtspInitialize 
            
        } // End of group utPrimitives
        
@@ -1028,6 +1009,39 @@ module LibItsAtsp_Templates {
	
		} // End of group cfPrimitives

	} // End of group atspPrimitives
	} // End of group atspInitPrimitives
	
	group atspPrimitives {
	
		group atspSend {
			/**
        	* @desc    Send template
			* Allows ITS test system to request frame transmission to IUT
        	* @param   p_inSapPrimitiveDown: IN-SAP primitive to send
        	*/
			template AtspReq m_atspReq(
				template(value) INsapPrimitivesDown p_inSapPrimitiveDown
			) := {
				msgOut:= p_inSapPrimitiveDown
			} // End of template m_atspReq
		}
		// End of group atspSend
	}
	
		group atspReceive {
			/**
        	* @desc    Send template
			* Allows ITS test system to request frame transmission to IUT
        	* @param   p_inSapPrimitiveDown: IN-SAP primitive to send
        	*/
			template AtspInd m_atspInd(
				template(value) INsapPrimitivesUp p_inSapPrimitiveUp
			) := {
				msgIn:= p_inSapPrimitiveUp
			} // End of template m_atspInd
		}
		// End of group atspReceive

	// end of group atspPrimitives

} // End of module LibItsAtsp_Templates
 No newline at end of file
+47 −47
Original line number Diff line number Diff line
@@ -46,53 +46,53 @@ module LibItsAtsp_TypesAndValues {
		const CIstatus c_ciStatusInactive := 128;
		
		const I_ParamNo c_ciIParamNoErrors := 0;
		const I_ParamNo c_ciIParamNoCommProfile := 1;
		const I_ParamNo c_ciIParamNoProperties := 2;
		const I_ParamNo c_ciIParamNoManuDeviceID := 3;
		const I_ParamNo c_ciIParamNoITS_scuId := 4;
		const I_ParamNo c_ciIParamNoMedID := 5;
		const I_ParamNo c_ciIParamNoLocalCIID := 6;
		const I_ParamNo c_ciIParamNoTimeoutReg := 7;
		const I_ParamNo c_ciIParamNoMacAddress := 8;
		const I_ParamNo c_ciIParamNoMacAddrTemp := 9;
		const I_ParamNo c_ciIParamNoCiClass := 10;
		const I_ParamNo c_ciIParamNoCiaClass := 11;
		const I_ParamNo c_ciIParamNoCiStatus := 12;
		const I_ParamNo c_ciIParamNoNotify := 13;
		const I_ParamNo c_ciIParamNoMedType := 14;
		const I_ParamNo c_ciIParamNoRegInfo := 15;
		const I_ParamNo c_ciIParamNoConnect := 16;
		const I_ParamNo c_ciIParamNoSimPin := 17;
		const I_ParamNo c_ciIParamNoProviderInfo := 18;
		const I_ParamNo c_ciIParamNoMinUserPriority := 19;
		const I_ParamNo c_ciIParamNoQueueLevel := 20;
		const I_ParamNo c_ciIParamNoQueueLowTh := 21;
		const I_ParamNo c_ciIParamNoQueueAlarmTh := 22;
		const I_ParamNo c_ciIParamNoDistancePeer := 23;
		const I_ParamNo c_ciIParamNoCommRangeRef := 24;
		const I_ParamNo c_ciIParamNoTimeOfLastRecep := 25;
		const I_ParamNo c_ciIParamNoInactTimeLimit := 26;
		const I_ParamNo c_ciIParamNoMediumUsage := 27;
		const I_ParamNo c_ciIParamNoMedUseObsTime := 28;
		const I_ParamNo c_ciIParamNoPeerMAC := 29;
		const I_ParamNo c_ciIParamNoVirtualCI := 30;
		const I_ParamNo c_ciIParamNoMinPrioCrossCI := 31;
		const I_ParamNo c_ciIParamNoRxSens := 32;
		const I_ParamNo c_ciIParamNoTxPower := 33;
		const I_ParamNo c_ciIParamNoTxPowMax := 34;
		const I_ParamNo c_ciIParamNoPeerRXpower := 35;
		const I_ParamNo c_ciIParamNoDataRate := 36;
		const I_ParamNo c_ciIParamNoDataRateNW := 37;
		const I_ParamNo c_ciIParamNoDataRatesNW := 38;
		const I_ParamNo c_ciIParamNoDataRateNWreq := 39;
		const I_ParamNo c_ciIParamNoDirectivity := 40;
		const I_ParamNo c_ciIParamNoBlockLength := 41;
		const I_ParamNo c_ciIParamNoFreeAirTime := 42;
		const I_ParamNo c_ciIParamNoFrameLengthMax := 43;
		const I_ParamNo c_ciIParamNoKineVectIn := 44;
		const I_ParamNo c_ciIParamNoKineVectOut := 45;
		const I_ParamNo c_ciIParamNoCost := 46;
		const I_ParamNo c_ciIParamNoReliability := 47;
		const I_ParamNo c_ciIParamNoCommProfile := 2;
		const I_ParamNo c_ciIParamNoProperties := 3;
		const I_ParamNo c_ciIParamNoManuDeviceID := 4;
		const I_ParamNo c_ciIParamNoITS_scuId := 5;
		const I_ParamNo c_ciIParamNoMedID := 6;
		const I_ParamNo c_ciIParamNoLocalCIID := 7;
		const I_ParamNo c_ciIParamNoTimeoutReg := 8;
		const I_ParamNo c_ciIParamNoMacAddress := 9;
		const I_ParamNo c_ciIParamNoMacAddrTemp := 10;
		const I_ParamNo c_ciIParamNoCiClass := 11;
		const I_ParamNo c_ciIParamNoCiaClass := 12;
		const I_ParamNo c_ciIParamNoCiStatus := 13;
		const I_ParamNo c_ciIParamNoNotify := 16;
		const I_ParamNo c_ciIParamNoMedType := 17;
		const I_ParamNo c_ciIParamNoRegInfo := 18;
		const I_ParamNo c_ciIParamNoConnect := 19;
		const I_ParamNo c_ciIParamNoSimPin := 20;
		const I_ParamNo c_ciIParamNoProviderInfo := 21;
		const I_ParamNo c_ciIParamNoMinUserPriority := 22;
		const I_ParamNo c_ciIParamNoQueueLevel := 23;
		const I_ParamNo c_ciIParamNoQueueLowTh := 24;
		const I_ParamNo c_ciIParamNoQueueAlarmTh := 25;
		const I_ParamNo c_ciIParamNoDistancePeer := 26;
		const I_ParamNo c_ciIParamNoCommRangeRef := 27;
		const I_ParamNo c_ciIParamNoTimeOfLastRecep := 28;
		const I_ParamNo c_ciIParamNoInactTimeLimit := 29;
		const I_ParamNo c_ciIParamNoMediumUsage := 30;
		const I_ParamNo c_ciIParamNoMedUseObsTime := 31;
		const I_ParamNo c_ciIParamNoPeerMAC := 32;
		const I_ParamNo c_ciIParamNoVirtualCI := 33;
		const I_ParamNo c_ciIParamNoMinPrioCrossCI := 34;
		const I_ParamNo c_ciIParamNoRxSens := 35;
		const I_ParamNo c_ciIParamNoTxPower := 36;
		const I_ParamNo c_ciIParamNoTxPowMax := 37;
		const I_ParamNo c_ciIParamNoPeerRXpower := 38;
		const I_ParamNo c_ciIParamNoDataRate := 39;
		const I_ParamNo c_ciIParamNoDataRateNW := 40;
		const I_ParamNo c_ciIParamNoDataRatesNW := 41;
		const I_ParamNo c_ciIParamNoDataRateNWreq := 42;
		const I_ParamNo c_ciIParamNoDirectivity := 43;
		const I_ParamNo c_ciIParamNoBlockLength := 44;
		const I_ParamNo c_ciIParamNoFreeAirTime := 45;
		const I_ParamNo c_ciIParamNoFrameLengthMax := 46;
		const I_ParamNo c_ciIParamNoKineVectIn := 47;
		const I_ParamNo c_ciIParamNoKineVectOut := 48;
		const I_ParamNo c_ciIParamNoCost := 49;
		const I_ParamNo c_ciIParamNoReliability := 50;
		const I_ParamNo c_ciIParamNoLogicalChannel := 51;
		
		const ErrStatus c_ciErrStatusSuccess := 0;