From b5df71186bdbba2d23ba3317b8ad3c2da4e6270b Mon Sep 17 00:00:00 2001
From: garciay <garciay@5a941883-869f-0410-b6e7-a816b635d326>
Date: Thu, 18 Aug 2016 12:23:00 +0000
Subject: [PATCH] Validate RSUsimulator against AtsSremSsem in non secured mode

---
 ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn | 16 ++++++++++++++--
 .../ItsRSUsSimulator_Templates.ttcn              | 14 +++++++-------
 .../ItsRSUsSimulator_TestCases.ttcn              | 11 ++++++++++-
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn
index fc3a0465b..2cfe866c1 100644
--- a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn
+++ b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn
@@ -682,7 +682,7 @@ module ItsRSUsSimulator_Pics {
         
         group ivimCommonParams {
             
-            modulepar BtpPortId PICS_IVIM_BTP_DESTINATION_PORT := 2005;
+            modulepar BtpPortId PICS_IVIM_BTP_DESTINATION_PORT := 2006;
             
             modulepar BtpPortId PICS_IVIM_BTP_SOURCE_PORT      := 0;
             
@@ -714,7 +714,7 @@ module ItsRSUsSimulator_Pics {
         
         group ssemCommonParams {
             
-            modulepar BtpPortId PICS_SSEM_BTP_DESTINATION_PORT := 2005;
+            modulepar BtpPortId PICS_SSEM_BTP_DESTINATION_PORT := 2008;
             
             modulepar BtpPortId PICS_SSEM_BTP_SOURCE_PORT      := 0;
             
@@ -722,6 +722,18 @@ module ItsRSUsSimulator_Pics {
         
     } // End of group ssemEvents
     
+    group sremEvents {
+        
+        group sremCommonParams {
+            
+            modulepar BtpPortId PICS_SREM_BTP_DESTINATION_PORT := 2007;
+            
+            modulepar BtpPortId PICS_SREM_BTP_SOURCE_PORT      := 0;
+            
+        } // End of group sremCommonParams
+        
+    } // End of group sremEvents
+    
     group generationFrequencies {
         
         modulepar boolean PICS_GENERATE_CAM := true;
diff --git a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn
index 40178120f..5167929ea 100644
--- a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn
+++ b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn
@@ -78,16 +78,16 @@ module ItsRSUsSimulator_Templates {
          * @param   p_seqNumber                 Sequence number of GeoUnicast packet
          * @param   p_nextHeader                Id of next header
          */
-        template (present) GnNonSecuredPacket mw_geoNwUnicastPacketWithNextHeader_srem(
-            in template (present) ShortPosVector p_destinationShortPosVec,
-            in template (present) UInt16 p_seqNumber,
-            in template (present) NextHeader p_nextHeader
-        ) modifies mw_geoNwUnicastPacketWithNextHeader := {
+        template (present) GnNonSecuredPacket mw_geoNwBroadcastPacketWithNextHeader_srem(
+                                                                                         in template (present) LongPosVector p_sourceLongPosVec := ?,
+                                                                                         in template (present) UInt16 p_seqNumber := ?,
+                                                                                         in template (present) NextHeader p_nextHeader := ?
+        ) modifies mw_geoNwBroadcastPacketWithNextHeader := {
             payload := { 
                 decodedPayload := { 
                     btpPacket := mw_btpB(
-                        ?, // TODO PICS_SREM_BTP_DESTINATION_PORT 
-                        ?, 
+                        PICS_SREM_BTP_DESTINATION_PORT, 
+                        PICS_SREM_BTP_SOURCE_PORT, 
                         ?
                     )
                 }, 
diff --git a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn
index efef878f4..275cf4797 100644
--- a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn
+++ b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn
@@ -54,19 +54,28 @@ module ItsRSUsSimulator_TestCases {
         if (ispresent(vc_rsuMessagesValueList[PX_RSU_ID - 1].ivim)) {
             tc_ivim.start;
         }
+        log("Expected SREM:", mw_geoNwInd(
+                    mw_geoNwPdu(
+                        mw_geoNwBroadcastPacketWithNextHeader_srem(
+                            ?,
+                            ?,
+                            e_btpB
+        ))));
         alt {
             [] geoNetworkingPort.receive(
                 mw_geoNwInd(
                     mw_geoNwPdu(
-                        mw_geoNwUnicastPacketWithNextHeader_srem(
+                        mw_geoNwBroadcastPacketWithNextHeader_srem(
                             ?,
                             ?,
                             e_btpB
             )))) -> value v_gnInd { // Receive a SREM message
+                log("*** " & testcasename() & ": DEBUG: Processing SREM ***");
                 f_processSrem(v_gnInd.msgIn);
                 repeat;
             }
             [] geoNetworkingPort.receive(mw_geoNwInd(?)) -> value v_gnInd { // Receive a message
+                log("*** " & testcasename() & ": DEBUG: Recieving unsollicited message ***");
                 // Nothing to do, just for logging purposes
                 repeat;
             }
-- 
GitLab