titanization_ats.patch 435 KB
Newer Older
garciay's avatar
garciay committed
-                    alt {                    	
-                    	[] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithArea(
+                    alt {                        
+                        [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithArea(
                                 mw_longPosVectorPosition(v_longPosVectorNodeA),
                                 ?,
                                 f_getGeoBroadcastArea(c_area1)
garciay's avatar
garciay committed
@@ -14217,17 +14243,17 @@
garciay's avatar
garciay committed
                     
                     // Test Body
                     f_sendGeoNetMessage(
-	                    m_geoNwReq_withLinkLayerDestination(
-	                        m_geoNwPdu(m_geoNwBroadcastPacket(
-	                                v_longPosVectorNodeA,
-	                                0,
-	                                f_getGeoBroadcastArea(c_area1)
-	                            )
-	                        ),
+                        valueof(m_geoNwReq_withLinkLayerDestination(
+                            m_geoNwPdu(m_geoNwBroadcastPacket(
+                                    v_longPosVectorNodeA,
+                                    0,
+                                    f_getGeoBroadcastArea(c_area1)
+                                )
+                            ),
                             -,
-	                        f_getIutMacAddress()
-	                    )
-                    );
+                            f_getIutMacAddress()
+                        )
+                    ));
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
                     // Postamble
garciay's avatar
garciay committed
@@ -14299,7 +14325,7 @@
garciay's avatar
garciay committed
                     
                     // Test Body
                     tc_ac.start;
-                    alt {                    	
+                    alt {                        
                         [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithArea(
                                 mw_longPosVectorPosition(v_longPosVectorNodeA),
                                 ?,
garciay's avatar
garciay committed
@@ -14334,7 +14360,7 @@
garciay's avatar
garciay committed
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeA,
                                     0,
garciay's avatar
garciay committed
@@ -14344,9 +14370,9 @@
garciay's avatar
garciay committed
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     tc_ac.start;
-                    alt {                    	
+                    alt {                        
                         [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithArea(
                                 mw_longPosVectorPosition(v_longPosVectorNodeA),
                                 ?,
garciay's avatar
garciay committed
@@ -14491,7 +14517,7 @@
garciay's avatar
garciay committed
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeE,
                                     0,
garciay's avatar
garciay committed
@@ -14499,7 +14525,7 @@
garciay's avatar
garciay committed
                                 )
                             )
                         )
-                    );
+                    ));
                     
                     t_toCbf.start;
                     tc_ac.start;
garciay's avatar
garciay committed
@@ -14638,7 +14664,7 @@
garciay's avatar
garciay committed
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeC,
                                     0,
garciay's avatar
garciay committed
@@ -14646,7 +14672,7 @@
garciay's avatar
garciay committed
                                 )
                             )
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
                     // Postamble
garciay's avatar
garciay committed
@@ -14811,7 +14837,7 @@
garciay's avatar
garciay committed
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeD,
                                     0,
garciay's avatar
garciay committed
@@ -14819,7 +14845,7 @@
garciay's avatar
garciay committed
                                 )
                             )
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
                     // Postamble
garciay's avatar
garciay committed
@@ -14902,7 +14928,7 @@
garciay's avatar
garciay committed
                             tc_ac.stop;
                             
                             if(t_toCbf.running) {
-                            	t_toCbf.stop;
+                                t_toCbf.stop;
                                 log("*** " & testcasename() & ": FAIL: GBC retransmitted before CBF timer expiration ***");
                                 f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
                             }
garciay's avatar
garciay committed
@@ -14941,7 +14967,7 @@
garciay's avatar
garciay committed
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeB,
                                     0,
garciay's avatar
garciay committed
@@ -14949,7 +14975,7 @@
garciay's avatar
garciay committed
                                 )
                             )
                         )
-                    );
+                    ));
                     
                     t_toCbf.start;
                     tc_ac.start;
garciay's avatar
garciay committed
@@ -15088,7 +15114,7 @@
garciay's avatar
garciay committed
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeC,
                                     0,
garciay's avatar
garciay committed
@@ -15096,7 +15122,7 @@
garciay's avatar
garciay committed
                                 )
                             )
                         )
-                    );
+                    ));
                     tc_ac.start;
                     alt {                       
                         [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithArea(
garciay's avatar
garciay committed
@@ -15214,7 +15240,7 @@
garciay's avatar
garciay committed
                     
                     // Preamble
                     f_prNeighbour();
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(m_geoNwBroadcastPacket(
                                 v_longPosVectorNodeB,
                                 0,
garciay's avatar
garciay committed
@@ -15221,7 +15247,7 @@
garciay's avatar
garciay committed
                                 f_getGeoBroadcastArea(c_area1)
                             )
                         )
-                    ));
+                    )));
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body                  
garciay's avatar
garciay committed
@@ -15266,7 +15292,7 @@
garciay's avatar
garciay committed
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(m_geoNwBroadcastPacket(
                                 v_longPosVectorNodeB,
                                 0,
garciay's avatar
garciay committed
@@ -15273,7 +15299,7 @@
garciay's avatar
garciay committed
                                 f_getGeoBroadcastArea(c_area1)
                             )
                         )
-                    ));
+                    )));
                     
                     t_toCbf.start;                    
                     tc_ac.start;
garciay's avatar
garciay committed
@@ -15401,15 +15427,15 @@
garciay's avatar
garciay committed
                 v_nbrOfPackets := f_getLsPacketBufferSize() / v_packetSize + 1;
                 log("*** " & testcasename() & ": " & int2str(v_nbrOfPackets) & " ***");
                 for (v_index:=1; v_index <= v_nbrOfPackets; v_index:=v_index+1) {
-	                if ( not f_utTriggerEvent(m_generateGeoUnicastMessageWithPayload(v_longPosVectorNodeA.gnAddr, char2oct("PAYLOAD_" & oct2str(int2oct(v_index, 2))))) ) {
-	                    log("*** " & testcasename() & ": INCONC: Trigger failed ***");
-	                    f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
-	                }
+                    if ( not f_utTriggerEvent(m_generateGeoUnicastMessageWithPayload(v_longPosVectorNodeA.gnAddr, char2oct("PAYLOAD_" & oct2str(int2oct(v_index, 2))))) ) {
+                        log("*** " & testcasename() & ": INCONC: Trigger failed ***");
+                        f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
+                    }
                 }
                 
                 f_sleepIgnoreDef(0.5);
                 f_sendGeoNetMessage(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwLsReplyPacket(
                                 v_longPosVectorNodeB,
garciay's avatar
garciay committed
@@ -15418,7 +15444,7 @@
garciay's avatar
garciay committed
                             )
                         )
                     )
-                );
+                ));
                 
                 // packet 1 shall be dropped
                 v_index := 2;
garciay's avatar
garciay committed
@@ -15617,7 +15643,7 @@
garciay's avatar
garciay committed
                     p_geoNetworkingMsg.gnPacket.packet.extendedHeader.geoUnicastHeader.dstPosVector := f_longPosVector2ShortPosVector(v_longPosVectorNodeA);
                     for (i:=0; i < p_nbrOfPackets; i:=i+1) {
                         p_geoNetworkingMsg.gnPacket.packet.extendedHeader.geoUnicastHeader.seqNumber := vc_localSeqNumber;
-                        f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(p_geoNetworkingMsg));
+                        f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(p_geoNetworkingMsg)));
                     }
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
garciay's avatar
garciay committed
@@ -15783,7 +15809,7 @@
garciay's avatar
garciay committed
                     
                     for (i:=0; i < p_nbrOfPackets; i:=i+1) {
                         p_geoNetworkingMsg.gnPacket.packet.extendedHeader.geoBroadcastHeader.seqNumber := vc_localSeqNumber;
-                        f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(p_geoNetworkingMsg));
+                        f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(p_geoNetworkingMsg)));
                     }
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
Index: AtsIPv6OverGeoNetworking/ItsIpv6OverGeoNetworking_TestCases.ttcn
===================================================================
garciay's avatar
garciay committed
--- AtsIPv6OverGeoNetworking/ItsIpv6OverGeoNetworking_TestCases.ttcn	(revision 2639)
garciay's avatar
garciay committed
+++ AtsIPv6OverGeoNetworking/ItsIpv6OverGeoNetworking_TestCases.ttcn	(working copy)
@@ -1084,7 +1084,7 @@
                 
                 // Test Body
                 f_sendGeoNetMessageWithPayload(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwBroadcastPacket(
                                 v_longPosVectorNodeA,
@@ -1092,7 +1092,7 @@
                                 f_getGeoBroadcastArea(vc_gvlTable[c_gvl1].area)
                             )
                         )
-                    ),
+                    )),
                     m_ipv6Payload(v_ipv6Packet)
                 );
                 
@@ -1190,7 +1190,7 @@
                 
                 // Test Body
                 f_sendGeoNetMessageWithPayload(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwBroadcastPacket(
                                 v_longPosVectorNodeA,
@@ -1198,7 +1198,7 @@
                                 f_getGeoBroadcastArea(vc_gvlTable[c_gvl2].area)
                             )
                         )
-                    ),
+                    )),
                     m_ipv6Payload(v_ipv6Packet)
                 );
                 
@@ -1289,7 +1289,7 @@
                 
                 // Test Body
                 f_sendGeoNetMessageWithPayload(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwAnycastPacket(
                                 v_longPosVectorNodeA,
@@ -1297,7 +1297,7 @@
                                 f_getGeoAnycastArea(vc_gvlTable[c_gvl1].area)
                             )
                         )
-                    ),
+                    )),
                     m_ipv6Payload(v_ipv6Packet)
                 );
                 
@@ -1394,7 +1394,7 @@
                 
                 // Test Body
                 f_sendGeoNetMessageWithPayload(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwBroadcastPacket(
                                 v_longPosVectorNodeA,
@@ -1402,7 +1402,7 @@
                                 f_getGeoBroadcastArea(vc_gvlTable[c_gvl1].area)
                             )
                         )
-                    ),
+                    )),
                     m_ipv6Payload(v_ipv6Packet)
                 );
                 
@@ -1507,7 +1507,7 @@
                 
                 // Test Body
                 f_sendGeoNetMessageWithPayload(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwBroadcastPacket(
                                 v_longPosVectorNodeA,
@@ -1515,7 +1515,7 @@
                                 f_getGeoBroadcastArea(vc_gvlTable[c_gvl3].area)
                             )
                         )
-                    ),
+                    )),
                     m_ipv6Payload(v_ipv6Packet)
                 );
                 
@@ -1614,7 +1614,7 @@
                 
                 // Test Body
                 f_sendGeoNetMessageWithPayload(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwUnicastPacket(
                                 v_longPosVectorNodeA,
@@ -1622,7 +1622,7 @@
                                 vc_localSeqNumber
                             )
                         )
-                    ),
+                    )),
                     m_ipv6Payload(v_ipv6Packet)
                 );
                 
@@ -1723,7 +1723,7 @@
                 
                 // Test Body
                 f_sendGeoNetMessageWithPayload(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwUnicastPacket(
                                 v_longPosVectorNodeB,
@@ -1731,7 +1731,7 @@
                                 vc_localSeqNumber
                             )
                         )
-                    ),
+                    )),
                     m_ipv6Payload(v_ipv6Packet)
                 );
                 
@@ -1830,7 +1830,7 @@
                 
                 // Test Body
                 f_sendGeoNetMessageWithPayload(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwUnicastPacket(
                                 v_longPosVectorNodeB,
@@ -1838,7 +1838,7 @@
                                 vc_localSeqNumber
                             )
                         )
-                    ),
+                    )),
                     m_ipv6Payload(v_ipv6Packet)
                 );
                 
@@ -1939,7 +1939,7 @@
                 
                 // Test Body
                 f_sendGeoNetMessageWithPayload(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwUnicastPacket(
                                 v_longPosVectorNodeB,
@@ -1947,7 +1947,7 @@
                                 vc_localSeqNumber
                             )
                         )
-                    ),
+                    )),
                     m_ipv6Payload(v_ipv6Packet)
                 );
                 
@@ -2049,7 +2049,7 @@
                 
                 // Test Body
                 f_sendGeoNetMessageWithPayload(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwUnicastPacket(
                                 v_longPosVectorNodeB,
@@ -2057,7 +2057,7 @@
                                 vc_localSeqNumber
                             )
                         )
-                    ),
+                    )),
                     m_ipv6Payload(v_ipv6Packet)
                 );
                 
@@ -2154,7 +2154,7 @@
                 
                 // Test Body
                 f_sendGeoNetMessageWithPayload(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwTsbPacket(
                                 vc_localSeqNumber,
@@ -2161,7 +2161,7 @@
                                 v_longPosVectorIut
                             )
                         )
-                    ),
+                    )),
                     m_ipv6Payload(v_ipv6Packet)
                 );
                 
@@ -2267,7 +2267,7 @@
                 
                 // Test Body
                 f_sendGeoNetMessageWithPayload(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwBroadcastPacket(
                                 v_longPosVectorNodeA,
@@ -2275,7 +2275,7 @@
                                 f_getGeoBroadcastArea(vc_gvlTable[c_gvl3].area)
                             )
                         )
-                    ),
+                    )),
                     m_ipv6Payload(v_ipv6Packet)
                 );
                 
@@ -2362,7 +2362,7 @@
                                 );
                                 
                 f_sendGeoNetMessageWithPayload(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwBroadcastPacket(
                                 v_longPosVectorNodeA,
@@ -2370,7 +2370,7 @@
                                 f_getGeoBroadcastArea(vc_gvlTable[c_gvl3].area)
                             )
                         )
-                    ),
+                    )),
                     m_ipv6Payload(v_ipv6Packet)
                 );
                 
garciay's avatar
garciay committed
Index: AtsIVIM/ItsIvim_TpFunctions.ttcn
===================================================================
garciay's avatar
garciay committed
--- AtsIVIM/ItsIvim_TpFunctions.ttcn	(revision 2639)
garciay's avatar
garciay committed
+++ AtsIVIM/ItsIvim_TpFunctions.ttcn	(working copy)
garciay's avatar
garciay committed
@@ -22,6 +22,7 @@
     import from LibItsCommon_Pixits all;
     import from LibItsCommon_Functions all;
     import from LibItsCommon_TypesAndValues all;
+    import from LibItsCommon_ASN1_NamedNumbers all;
     
     // LibIts
     import from ITS_Container language "ASN.1:1997" all;
garciay's avatar
garciay committed
@@ -34,6 +35,7 @@
     import from LibItsIvim_TestSystem all;
     import from LibItsIvim_Functions all;
     import from LibItsIvim_Pics all;
+    import from LibItsIvim_ASN1_IVInamedNumbers all;
     
     group iviMessageTransmission { 
         
garciay's avatar
garciay committed
@@ -177,7 +179,7 @@
garciay's avatar
garciay committed
                 // Preamble
                 f_prInitialState();
                 for (i := 0; i < lengthof(v_utTriggers) - 1; i := i + 1) {
-                    f_utTriggerEvent(v_utTriggers[i]);
+                    f_utTriggerEvent(valueof(v_utTriggers[i]));
                     f_awaitIviMessage(mw_ivimInd(mw_anyIvimPdu), v_ivimInd);
                     v_iviIdentificationNumbers[i] := v_ivimInd.msgIn.ivi.mandatory.iviIdentificationNumber;
                 }
garciay's avatar
garciay committed
@@ -184,7 +186,7 @@
garciay's avatar
garciay committed
                 f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                 
                 // Test Body
-                f_utTriggerEvent(v_utTriggers[lengthof(v_utTriggers) - 1]);
+                f_utTriggerEvent(valueof(v_utTriggers[lengthof(v_utTriggers) - 1]));
                 f_awaitIviMessage(mw_ivimInd(mw_anyIvimPdu), v_ivimInd);
                 v_iviIdentificationNumbers[lengthof(v_iviIdentificationNumbers) - 1] := v_ivimInd.msgIn.ivi.mandatory.iviIdentificationNumber;
                 
garciay's avatar
garciay committed
@@ -239,7 +241,7 @@
garciay's avatar
garciay committed
                 // Preamble
                 f_prInitialState();
                 for (i := 0; i < lengthof(v_utTriggers) - 1; i := i + 1) {
-                    f_utTriggerEvent(v_utTriggers[i]);
+                    f_utTriggerEvent(valueof(v_utTriggers[i]));
                     f_awaitIviMessage(mw_ivimInd(mw_anyIvimPdu), v_ivimInd);
                     f_poCancelEvent(e_iut, v_ivimInd.msgIn.ivi.mandatory.iviIdentificationNumber);
                 }
garciay's avatar
garciay committed
@@ -248,7 +250,7 @@
garciay's avatar
garciay committed
                 f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                 
                 // Test Body
-                f_utTriggerEvent(v_utTriggers[lengthof(v_utTriggers) - 1]);
+                f_utTriggerEvent(valueof(v_utTriggers[lengthof(v_utTriggers) - 1]));
                 
                 tc_ac.start;
                 alt {
garciay's avatar
garciay committed
@@ -1565,13 +1567,13 @@
garciay's avatar
garciay committed
             v_ivimReq := valueof(
                 m_ivimReq(
                     m_ivimStructurePdu(
-                        m_ivimStructure(
-                            m_iviManagementContainer(
+                        valueof(m_ivimStructure(
+                            valueof(m_iviManagementContainer(
                                 f_getProvider(),
                                 1,
                                 IviStatus_new_
-                            )
-                        )
+                            ))
+                        ))
                     )
                 )
             );
garciay's avatar
garciay committed
Index: AtsMapemSpatem/ItsMapem_TpFunctions.ttcn
===================================================================
garciay's avatar
garciay committed
--- AtsMapemSpatem/ItsMapem_TpFunctions.ttcn	(revision 2639)
garciay's avatar
garciay committed
+++ AtsMapemSpatem/ItsMapem_TpFunctions.ttcn	(working copy)
garciay's avatar
garciay committed
@@ -26,7 +26,7 @@
     import from ITS_Container language "ASN.1:1997" all;
     import from MAPEM_PDU_Descriptions language "ASN.1:1997" all;
     import from SPATEM_PDU_Descriptions language "ASN.1:1997" all;
-    import from DSRC language "ASN.1:1997" all;
+    import from IS_DSRC language "ASN.1:1997" all;
     
     // LibItsMapemSpatem
     import from LibItsMapemSpatem_TestSystem all;
garciay's avatar
garciay committed
Index: AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn
===================================================================
garciay's avatar
garciay committed
--- AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn	(revision 2639)
garciay's avatar
garciay committed
+++ AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn	(working copy)
garciay's avatar
garciay committed
@@ -26,7 +26,7 @@
     import from ITS_Container language "ASN.1:1997" all;
     import from MAPEM_PDU_Descriptions language "ASN.1:1997" all;
     import from SPATEM_PDU_Descriptions language "ASN.1:1997" all;
-    import from DSRC language "ASN.1:1997" all;
+    import from IS_DSRC language "ASN.1:1997" all;
     
     // LibItsMapemSpatem
     import from LibItsMapemSpatem_TestSystem all;
garciay's avatar
garciay committed
Index: AtsRSUsSimulator/ItsRSUSimulator_PicsInitConsts.ttcn
===================================================================
garciay's avatar
garciay committed
--- AtsRSUsSimulator/ItsRSUSimulator_PicsInitConsts.ttcn	(nonexistent)
+++ AtsRSUsSimulator/ItsRSUSimulator_PicsInitConsts.ttcn	(working copy)
garciay's avatar
garciay committed
@@ -0,0 +1,5636 @@
+module ItsRSUSimulator_PicsInitConsts {
+    
+    // LibCommon
+    import from LibCommon_BasicTypesAndValues all;
+    
+    // LibIts
+    import from ITS_Container language "ASN.1:1997" all;
+    import from IVI language "ASN.1:1997" all;
+    import from IS_DSRC language "ASN.1:1997" all;
garciay's avatar
garciay committed
+    import from EVCSN_PDU_Descriptions language "ASN.1:1997" all;
+    
+    // LibItsCommon
+    import from LibItsCommon_ASN1_NamedNumbers all;
+
+    // LibItsBtp
+    import from LibItsBtp_TypesAndValues all;
+    
+    // LibItsGeoNetworking
+    import from LibItsGeoNetworking_TypesAndValues all;
+    
+    // LibItsSecurity
+    import from LibItsSecurity_TypesAndValues all;
+    
+    // ItsRSUsSimulator
+    import from ItsRSUsSimulator_TypesAndValues all;
+    
+    /**
+     * @desc This group describes the RSUs installed on the track
+     */
+    group rsuParameters {
+        
+        /**
+         * @desc RSU #1
+         */
+        group rsu1 {
+            
+            /**
+             * @desc RSU GN address
+             */
+            const GN_Address c_PICS_RSU_GN_ADDRESS_RSU1 := {
+                typeOfAddress         := e_manual,
+                stationType           := e_roadSideUnit,
+                stationCountryCode    := 33,
garciay's avatar
garciay committed
+                mid                   := '001C6B0D0201'O
+            } // End of c_PICS_RSU_GN_ADDRESS_RSU1
+            
+            const RsuParm c_PICS_RSU1 := {
+                longPosVector := {
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU1,
+                    timestamp_    := 0,
+                    latitude      := 435529150,
+                    longitude     := 103010520,
+                    pai           := '0'B,
+                    speed         := 0,
+                    heading       := 0
+                },
+                stationID := 1111101,
+                stationType := StationType_roadSideUnit_,
+                vehicleRole := roadOperator,
+                geoShape := e_geoCircle,
+                geoParms := {
+                    radius := 5000
+                },
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU1
+            } // End of c_PICS_RSU1
+            
+            /**
+             * @desc Path history to approch the RSU
+             */
+            const PathHistory c_PICS_RSU_PATH_HISTORY_RSU1 := {};
+            
+        } // End of group rsu1
+        
+        /**
+         * @desc RSU #2
+         */
+        group rsu2 {
+            
+            /**
+             * @desc RSU GN address
+             */
+            const GN_Address c_PICS_RSU_GN_ADDRESS_RSU2 := {
+                typeOfAddress         := e_manual,
+                stationType           := e_roadSideUnit,
+                stationCountryCode    := 33,
garciay's avatar
garciay committed
+                mid                   := '001C6B0D0202'O
+            } // End of c_PICS_RSU_GN_ADDRESS_RSU2
+            
+            const RsuParm c_PICS_RSU2 := {
+                longPosVector := {
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU2,
+                    timestamp_    := 0,
+                    latitude      := 435512090,
+                    longitude     := 103002510,
+                    pai           := '0'B,
+                    speed         := 0,
+                    heading       := 0
+                },
+                stationID := 1111102,
+                stationType := StationType_roadSideUnit_,
+                vehicleRole := roadOperator,
+                geoShape := e_geoCircle,
+                geoParms := {
+                    radius := 5000
+                },
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU2
+            } // End of c_PICS_RSU2
+            
+            /**
+             * @desc Path history to approch the RSU
+             */
+            const PathHistory c_PICS_RSU_PATH_HISTORY_RSU2 := {};
+            
+        } // End of group rsu2
+        
+        /**
+         * @desc RSU #3
+         */
+        group rsu3 {
+            
+            /**
+             * @desc RSU GN address
+             */
+            const GN_Address c_PICS_RSU_GN_ADDRESS_RSU3 := {
+                typeOfAddress         := e_manual,
+                stationType           := e_roadSideUnit,
+                stationCountryCode    := 33,
garciay's avatar
garciay committed
+                mid                   := '001C6B0D0203'O
+            } // End of c_PICS_RSU_GN_ADDRESS_RSU3
+            
+            const RsuParm c_PICS_RSU3 := {
+                longPosVector := {
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU3,
+                    timestamp_    := 0,
+                    latitude      := 435546630,
+                    longitude     := 103041900,
+                    pai           := '0'B,
+                    speed         := 0,
+                    heading       := 0
+                },
+                stationID := 1111103,
+                stationType := StationType_roadSideUnit_,
+                vehicleRole := roadOperator,
+                geoShape := e_geoCircle,
+                geoParms := {
+                    radius := 5000
+                },
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU3
+            } // End of c_PICS_RSU3
+            
+            /**
+             * @desc Path history to approch the RSU
+             */
+            const PathHistory c_PICS_RSU_PATH_HISTORY_RSU3 := {};
+            
+        } // End of group rsu3
+        
+        /**
+         * @desc RSU #4
+         */
+        group rsu4 {
+            
+            /**
+             * @desc RSU GN address
+             */
+            const GN_Address c_PICS_RSU_GN_ADDRESS_RSU4 := {
+                typeOfAddress         := e_manual,
+                stationType           := e_roadSideUnit,
+                stationCountryCode    := 33,
garciay's avatar
garciay committed
+                mid                   := '001C6B0D0204'O
+            } // End of c_PICS_RSU_GN_ADDRESS_RSU4
+            
+            const RsuParm c_PICS_RSU4 := {
+                longPosVector := {
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU4,
+                    timestamp_    := 0,
+                    latitude      := 435582150,
+                    longitude     := 103065170,
+                    pai           := '0'B,
+                    speed         := 0,
+                    heading       := 0
+                },
+                stationID := 1111104,
+                stationType := StationType_roadSideUnit_,
+                vehicleRole := roadOperator,
+                geoShape := e_geoCircle,
+                geoParms := {
+                    radius := 5000
+                },
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU4
+            } // End of c_PICS_RSU4
+            
+            /**
+             * @desc Path history to approch the RSU
+             */
+            const PathHistory c_PICS_RSU_PATH_HISTORY_RSU4 := {};
+            
+        } // End of group rsu4
+        
+        /**
+         * @desc RSU #5
+         */
+        group rsu5 {
+            
+            /**
+             * @desc RSU GN address
+             */
+            const GN_Address c_PICS_RSU_GN_ADDRESS_RSU5 := {
+                typeOfAddress         := e_manual,
+                stationType           := e_roadSideUnit,
+                stationCountryCode    := 33,
garciay's avatar
garciay committed
+                mid                   := '001C6B0D0205'O
+            } // End of c_PICS_RSU_GN_ADDRESS_RSU5
+            
+            const RsuParm c_PICS_RSU5 := {
+                longPosVector := {
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU5,
+                    timestamp_    := 0,
+                    latitude      := 435838400,
+                    longitude     := 103249780,
+                    pai           := '0'B,
+                    speed         := 0,
+                    heading       := 0
+                },
+                stationID := 1111105,
+                stationType := StationType_roadSideUnit_,
+                vehicleRole := roadOperator,
+                geoShape := e_geoCircle,
+                geoParms := {
+                    radius := 5000
+                },
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU5
+            } // End of c_PICS_RSU5
+            
+            /**
+             * @desc Path history to approch the RSU
+             */
+            const PathHistory c_PICS_RSU_PATH_HISTORY_RSU5 := {};
+            
+        } // End of group rsu5
+        
+        /**
+         * @desc RSU #6
+         */
+        group rsu6 {
+            
+            /**
+             * @desc RSU GN address
+             */
+            const GN_Address c_PICS_RSU_GN_ADDRESS_RSU6 := {
+                typeOfAddress         := e_manual,
+                stationType           := e_roadSideUnit,
+                stationCountryCode    := 33,
garciay's avatar
garciay committed
+                mid                   := '001C6B0D0206'O
+            } // End of c_PICS_RSU_GN_ADDRESS_RSU6
+            
+            const RsuParm c_PICS_RSU6 := {
+                longPosVector := {
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU6,
+                    timestamp_    := 0,
+                    latitude      := 435923480,
+                    longitude     := 103375540,
+                    pai           := '0'B,
+                    speed         := 0,
+                    heading       := 0
+                },
+                stationID := 1111106,
+                stationType := StationType_roadSideUnit_,
+                vehicleRole := roadOperator,
+                geoShape := e_geoCircle,
+                geoParms := {
+                    radius := 5000
+                },
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU6
+            } // End of c_PICS_RSU6
+            
+            /**
+             * @desc Path history to approch the RSU
+             */
+            const PathHistory c_PICS_RSU_PATH_HISTORY_RSU6 := {};
+            
+        } // End of group rsu6
+        
+        /**
+         * @desc RSU #7
+         */
+        group rsu7 {
+            
+            /**
+             * @desc RSU GN address
+             */
+            const GN_Address c_PICS_RSU_GN_ADDRESS_RSU7 := {
+                typeOfAddress         := e_manual,
+                stationType           := e_roadSideUnit,
+                stationCountryCode    := 33,
garciay's avatar
garciay committed
+                mid                   := '001C6B0D0207'O
+            } // End of c_PICS_RSU_GN_ADDRESS_RSU7
+            
+            const RsuParm c_PICS_RSU7 := {
+                longPosVector := {
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU7,
+                    timestamp_    := 0,
+                    latitude      := 435550580,
+                    longitude     := 103032980,
+                    pai           := '0'B,
+                    speed         := 0,
+                    heading       := 0
+                },
+                stationID := 1111107,
+                stationType := StationType_roadSideUnit_,
+                vehicleRole := roadOperator,
+                geoShape := e_geoCircle,
+                geoParms := {
+                    radius := 5000
+                },
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU7
+            } // End of c_PICS_RSU7
+            
+            /**
+             * @desc Path history to approch the RSU
+             */
+            const PathHistory c_PICS_RSU_PATH_HISTORY_RSU7 := {};
+            
+        } // End of group rsu7
+        
+        /**
+         * @desc RSU #8
+         */
+        group rsu8 {
+            
+            /**
+             * @desc RSU GN address
+             */
+            const GN_Address c_PICS_RSU_GN_ADDRESS_RSU8 := {
+                typeOfAddress         := e_manual,
+                stationType           := e_roadSideUnit,
+                stationCountryCode    := 33,
garciay's avatar
garciay committed
+                mid                   := '001C6B0D0208'O
+            } // End of c_PICS_RSU_GN_ADDRESS_RSU8
+            
+            const RsuParm c_PICS_RSU8 := {
+                longPosVector := {
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU8,
+                    timestamp_    := 0,
+                    latitude      := 435546630,
+                    longitude     := 103041900,
+                    pai           := '0'B,
+                    speed         := 0,
+                    heading       := 0
+                },
+                stationID := 1111108,
+                stationType := StationType_roadSideUnit_,
+                vehicleRole := roadOperator,
+                geoShape := e_geoCircle,
+                geoParms := {
+                    radius := 5000
+                },
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU8
+            } // End of c_PICS_RSU8
+            
+            /**
+             * @desc Path history to approch the RSU
+             */
+            const PathHistory c_PICS_RSU_PATH_HISTORY_RSU8 := {};
+            
+        } // End of group rsu8
+        
+    } // End of group rsuParameters
+    
+    /*
+     * @desc This group describes the BEACON common settings for the RSUs CAM message broadcast
+     */
+    group beaconParams {
+        
+        /**
+         * @desc Common settings
+         */
+        group beaconCommonSettings {
+            
+            const UInt32 c_PICS_BEACON_ITS_AID                 := 141;
+            
+        } // End of group beaconCommonSettings
+        
+    } // End of group beaconParams
+    
+    /**
+     * @desc This group describes the CAM common settings for the RSUs CAM message broadcast
+     */
+    group camParams {
+        
+        /**
+         * @desc Common settings
+         */
+        group camCommonSettings {
+            
+            const BtpPortId c_PICS_CAM_BTP_DESTINATION_PORT := 2001;
+            
+            const BtpPortId c_PICS_CAM_BTP_SOURCE_PORT      := 0;
+            
+            const UInt32 c_PICS_CAM_ITS_AID                 := 36;
+            
+        } // End of group camCommonSettings
+        
+        group camUseCase6 {
+            
+            group camUseCase6VehicleTemplateDescription {
+                
+                const LongPosVector c_PICS_UC6_VEHICLE_TEMPLATE_POSITION := {
+                    gnAddr := {