Commit 696185fd authored by Yann Garcia's avatar Yann Garcia
Browse files

Add UtCamChangePseudonym for TC_SEC_ITSS_SND_CAM_23_BV..25_BV

parent 05ad5fcc

lib/LibItsCam_EncdecDeclarations.ttcn

+42 −39
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ module LibItsCam_EncdecDeclarations { 
    external function fx_enc_UtCamChangePosition (UtCamChangePosition p) return bitstring

        with {extension "prototype(convert) encode(UpperTester)"}

    

    external function fx_enc_UtCamChangePseudonym (UtCamChangePseudonym p) return bitstring

        with {extension "prototype(convert) encode(UpperTester)"}

    

    external function fx_enc_UtCamTrigger (UtCamTrigger p) return bitstring

        with {extension "prototype(convert) encode(UpperTester)"}

lib/LibItsCam_Templates.ttcn

+7 −0
Original line number Diff line number Diff line
@@ -141,6 +141,13 @@ module LibItsCam_Templates { 
                changeSpeed := p_changeSpeed

            }



            /**

             * @desc Request for changing pseudonym with the specified certificate.

             */

            template (value) UtCamChangePseudonym m_utCamChangePseudonym(in Oct8 p_hashedId8) := {

                hashedId8 := p_hashedId8

            }

            

            /**

             * @desc Set the acceleration control status

             * @param p_status The status to set

lib/LibItsCam_TypesAndValues.ttcn

+237 −227
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ module LibItsCam_TypesAndValues { 
      boolean utCamInitializeResult,

        boolean utCamTriggerResult,

        boolean utCamChangePositionResult,

        boolean utCamChangePseudonymResult,

        boolean utActivatePositionTimeResult,

        boolean utDeactivatePositionTimeResult

      } with {
@@ -108,6 +109,15 @@ module LibItsCam_TypesAndValues { 
      variant "FIELDORDER(msb)"

      }

        

    /**

     * @desc    Send template for Upper Tester event changePseudonym

     */

    type record UtCamChangePseudonym {

      Oct8 hashedId8 

    } with {

      variant "FIELDORDER(msb)"

    }

    

    /**

     * @desc 

     * @member changeCurvature Changes the curvature.

lib_system/LibItsCam_Functions.ttcn

+649 −614
Original line number Diff line number Diff line
@@ -122,6 +122,41 @@ module LibItsCam_Functions { 
            

        }

                    

    /**

      * @desc    Requests to change the IUT with a new pseudonym

      * @param   p_change The change to trigger.

      */

    function f_utCamChangePseudonym ( template (value) UtCamChangePseudonym p_change ) runs on ItsCam {

        

        //deactivate gnPort default alts

        vc_camDefaultActive := false;

        

        utPort.send(p_change);

        tc_wait.start;

        alt {

            [] utPort.receive(UtCamResults: { utCamChangePseudonymResult := true}) {

                tc_wait.stop;

                log("*** " & testcasename() & ": INFO: IUT pseudonym changed ***");

            }

            [] utPort.receive(UtCamResults: { utCamChangePseudonymResult := false}) {

                tc_wait.stop;

                log("*** " & testcasename() & ": INFO: IUT pseudonym unchanged ***");

                f_selfOrClientSyncAndVerdict("error", e_error);

            }

            [] a_utDefault() {

              //empty on purpose

            }

            [] tc_wait.timeout {

                log("*** " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time ***");

                f_selfOrClientSyncAndVerdict("error", e_timeout);

            }

        }

        

        //activate camPort default alts

        vc_camDefaultActive := true;

        

    }

    

    } // End of group utFunctions

    

    group adapterControl {

lib_system/LibItsCam_TestSystem.ttcn

+117 −120
Original line number Diff line number Diff line
@@ -12,14 +12,11 @@ 
module LibItsCam_TestSystem language "TTCN-3:2010 Real Time and Performance Testing" {

    

    // LibCommon

//    import from LibCommon_Time {modulepar all};

//    import from LibCommon_Sync all;

    import from LibCommon_BasicTypesAndValues all;

    import from LibCommon_DataStrings all;

    

    // LibIts

    import from CAM_PDU_Descriptions language "ASN.1:1997" all;

//    import from DENM_PDU_Descriptions language "ASN.1:1997" all;

    

    // LibItsCommon

    import from LibItsCommon_TestSystem all;
@@ -45,7 +42,7 @@ module LibItsCam_TestSystem language "TTCN-3:2010 Real Time and Performance Test 
         */

        type port UpperTesterPort message {

            out 

                UtCamInitialize, UtCamTrigger, UtCamChangePosition, UtActivatePositionTime, UtDeactivatePositionTime;

                UtCamInitialize, UtCamTrigger, UtCamChangePosition, UtCamChangePseudonym, UtActivatePositionTime, UtDeactivatePositionTime;

            in 

                UtCamResults, UtCamEventInd;

        } // end UpperTesterPort