Bug fixed on ItsRSUsSimulator

ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pixits.ttcn

@@ -42,20 +42,4 @@ module ItsRSUsSimulator_Pixits {
      */
     modulepar integer PX_ETSI_ZONE_ID := 1;
     
-    modulepar boolean PICS_GENERATE_BEACON   := false;
-    
-    modulepar boolean PICS_GENERATE_CAM      := true;
-    
-    modulepar boolean PICS_GENERATE_DENM     := false;
-    
-    modulepar boolean PICS_GENERATE_IVIM     := false;
-    
-    modulepar boolean PICS_GENERATE_MAPEM    := false;
-    
-    modulepar boolean PICS_GENERATE_SPATEM   := false;
-    
-    modulepar boolean PICS_GENERATE_SSEM     := false;
-    
-    //modulepar boolean PICS_GENERATE_EVCSN    := false;
-    
 } // End of module ItsRSUsSimulator_Pixits

ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn

@@ -16,6 +16,14 @@ module ItsRSUsSimulator_TestSystem {
   import from LibItsDenm_TestSystem all;
   import from LibItsDenm_TypesAndValues all;
     
+  // LibItsHttp
+  import from LibItsHttp_TestSystem all;
+  import from LibItsHttp_TypesAndValues all;
+  
+  // LibItsPki
+  import from LibItsHttp_TestSystem all;
+  import from LibItsPki_TypesAndValues all;
+  
   // AtsRSUsSimulator
   import from ItsRSUsSimulator_TypesAndValues all;
   import from ItsRSUsSimulator_Pics all;
@@ -25,6 +33,7 @@ module ItsRSUsSimulator_TestSystem {
    * @desc Test component for ITS Network and Transport layer
    */
   type component ItsRSUsSimulator extends ItsGeoNetworking {
+    port HttpPort httpPort;
     /**
      * @desc RSUsimulator configuration port
      */
@@ -96,6 +105,7 @@ module ItsRSUsSimulator_TestSystem {
     var boolean vc_ivim   := PICS_GENERATE_IVIM;
     var boolean vc_mapem  := PICS_GENERATE_MAPEM;
     var boolean vc_spatem := PICS_GENERATE_SPATEM;
+    var boolean vc_pki := PICS_PKI_SUPPORT;
     //var boolean vc_evcsn := PICS_GENERATE_EVCSN;
     var float vc_cam_timer_value  := PICS_CAM_FREQUENCY;
     timer tc_beacon := PICS_BEACON_FREQUENCY;
@@ -113,6 +123,7 @@ module ItsRSUsSimulator_TestSystem {
      */
   type component ItsRSUsSimulatorSystem extends ItsGeoNetworkingSystem {
     port ConfigRsuSimulatorPort cfPort; 
+    port HttpPort httPort;
   }
     
   type record of record {
@@ -149,9 +160,9 @@ module ItsRSUsSimulator_TestSystem {
      */
     type port ConfigRsuSimulatorPort message {
       out 
-      CfInitialize, CfResult, UtGnResults, UtCamResults, UtDenmResults, UtCamEventInd;
+      CfInitialize, CfResult, UtGnResults, UtCamResults, UtDenmResults, UtCamEventInd, UtPkiResults;
       in 
-      CfEvent, CfEventInd, UtGnInitialize, UtCamInitialize, UtDenmInitialize, UtGnTrigger, UtCamTrigger
+      CfEvent, CfEventInd, UtGnInitialize, UtCamInitialize, UtDenmInitialize, UtGnTrigger, UtCamTrigger, UtPkiInitialize, UtPkiTrigger
       } // End of ConfigRsuSimulatorPort
         
   } // End of group configRsuSimulatorPort