Commit 30019907 authored by garciay's avatar garciay
Browse files

STF545: Enhance scripts

parent 117a4e97

ccsrc/Ports/LibIts_ports/CAM_ports/AdapterControlPort_CAM.partC

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ void AdapterControlPort::outgoing_send(const LibItsCommon__TypesAndValues::AcSec 
      loggers::get_instance().log_msg("AdapterControlPort::outgoing_send: Send response: ", response);

      incoming_message(response);

    } else {

      loggers::get_instance().error("AdapterControlPort::outgoing_send: %s not registered", "geoNetworkingPort");

      loggers::get_instance().error("AdapterControlPort::outgoing_send: CAM not registered");

    }

}

etc/AtsAutoInterop/AtsAutoInterop.cfg

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ MatchingHints:=Detailed 
#   secured_mode           : Set to 1 if message exchanges shall be signed

#   encrypted_mode         : Set to 1 if message exchanges shall be encrypted

#                            NOTE: For signed & encrypted message exchanges, both secured_mode and encrypted_mode shall be set to 1

#   secure_db_path         : Path to the certificates and keys storage location

#   sec_db_path            : Path to the certificates and keys storage location

#   hash                   : Hash algorithm to be used when secured mode is set

#                            Authorized values are SHA-256 or SHA-384

#                            Default: SHA-256

etc/AtsCAM/AtsCAM.cfg

+8 −4
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ LibItsCommon_Pixits.PX_IUT_STATION_ID := 2533729309 
LibItsGeoNetworking_Pixits.PX_GN_UPPER_LAYER := e_btpB



LibItsCam_Pics.PICS_DANGEROUSGOODS := false

LibItsCam_Pics.PICS_IS_IUT_SECURED := true



[LOGGING]

# In this section you can specify the name of the log file and the classes of events
@@ -48,7 +49,7 @@ LogEventTypes:= Yes 
#   secured_mode           : Set to 1 if message exchanges shall be signed

#   encrypted_mode         : Set to 1 if message exchanges shall be encrypted

#                            NOTE: For signed & encrypted message exchanges, both secured_mode and encrypted_mode shall be set to 1

#   secure_db_path         : Path to the certificates and keys storage location

#   sec_db_path            : Path to the certificates and keys storage location

#   hash                   : Hash algorithm to be used when secured mode is set

#                            Authorized values are SHA-256 or SHA-384

#                            Default: SHA-256
@@ -89,10 +90,12 @@ LogEventTypes:= Yes 
#     time_offset : Time offset, used to skip packets with time offset < time_offset

#     save_mode   : Set to 1 to save sent packet, 0 otherwise



system.camPort.params := "CAM(next_header=btpB,header_type=tsb,header_sub_type=sh)/BTP/GN(ll_address=4C5E0C14D2EA,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,device_mode=1)/ETH(mac_src=080027500f9b)/PCAP(mac_src=080027500f9b,nic=tap0,filter=and ether proto 0x8947)"

system.camPort.params := "CAM(next_header=btpB,header_type=tsb,header_sub_type=sh)/BTP/GN(ll_address=4C5E0C14D2EA,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,device_mode=1,secured_mode=1,sec_db_path=/home/vagrant/tmp/asn1c_cert)/ETH(mac_src=080027500f9b)/PCAP(mac_src=080027500f9b,nic=eth2,filter=and ether proto 0x8947)"

#system.camPort.params := "CAM(next_header=btpB,header_type=tsb,header_sub_type=sh)/BTP/GN(ll_address=4C5E0C14D2EA,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,device_mode=1)/ETH(mac_src=080027500f9b)/PCAP(mac_src=080027500f9b,nic=tap0,filter=and ether proto 0x8947)" # Nordsys



# CAM UpperTester port based on UDP

system.utPort.params := "UT_CAM/UDP(dst_ip=172.23.0.1,dst_port=8000)"

system.utPort.params := "UT_CAM/UDP(dst_ip=192.168.2.3,dst_port=8000)"

#system.utPort.params := "UT_CAM/UDP(dst_ip=172.23.0.1,dst_port=8000)" # Nordsys



[EXECUTE]

#ItsCam_TestCases.TC_CAM_MSD_FMT_BV_01
@@ -142,7 +145,8 @@ system.utPort.params := "UT_CAM/UDP(dst_ip=172.23.0.1,dst_port=8000)" 
#ItsCam_TestCases.TC_CAM_MSD_INA_BV_06

#ItsCam_TestCases.TC_CAM_MSD_INA_BV_07

#ItsCam_TestCases.TC_CAM_MSD_INA_BV_08

ItsCam_TestCases.TC_CAM_MSP_BV_01

ItsCam_TestCases.TC_CAM_MSD_SSP_BO_02

#ItsCam_TestCases.TC_CAM_MSP_BV_01



[MAIN_CONTROLLER]

# The options herein control the behavior of MC.

etc/AtsDENM/AtsDENM.cfg

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ LogEventTypes:= Yes 
#   secured_mode           : Set to 1 if message exchanges shall be signed

#   encrypted_mode         : Set to 1 if message exchanges shall be encrypted

#                            NOTE: For signed & encrypted message exchanges, both secured_mode and encrypted_mode shall be set to 1

#   secure_db_path         : Path to the certificates and keys storage location

#   sec_db_path            : Path to the certificates and keys storage location

#   hash                   : Hash algorithm to be used when secured mode is set

#                            Authorized values are SHA-256 or SHA-384

#                            Default: SHA-256

etc/AtsGeoNetworking/AtsGeoNetworking.cfg

+14 −16
Original line number Diff line number Diff line
@@ -3,11 +3,10 @@ 
# This section shall contain the values of all parameters that are defined in your TTCN-3 modules.



# The GeoNetworking address of the IUT.

LibItsGeoNetworking_Pics.PICS_GN_LOCAL_GN_ADDR := {

  typeOfAddress := e_initial,

  stationType := e_roadSideUnit, #e_passengerCar

  stationCountryCode := 232,

  mid := '08002729c3e8'O

LibItsGeoNetworking_Pics.PICS_GN_LOCAL_GN_ADDR := {                                                                                                           typeOfAddress := e_manual,

  stationType := e_passengerCar,

  stationCountryCode := 0,

  mid := '000000000001'O

#  typeOfAddress := e_initial,

#  stationType := e_unknown, #e_roadSideUnit,

#  stationCountryCode := 0, #33,
@@ -15,7 +14,7 @@ LibItsGeoNetworking_Pics.PICS_GN_LOCAL_GN_ADDR := { 
}



LibItsGeoNetworking_Pics.PICS_GN_IS_MOBILE := false

LibItsGeoNetworking_Pics.PICS_GN_DEFAULT_HOP_LIMIT := 10

LibItsGeoNetworking_Pics.PICS_GN_DEFAULT_HOP_LIMIT := 1



LibItsGeoNetworking_Pixits.PX_GN_UPPER_LAYER := e_any

LibItsGeoNetworking_Pixits.PX_NEIGHBOUR_DISCOVERY_DELAY := 2.0
@@ -25,10 +24,10 @@ LibItsGeoNetworking_Pixits.PX_NEIGHBOUR_DISCOVERY_DELAY := 2.0 
# you want to log into the file or display on console (standard error).



LogFile := "../logs/%e.%h-%r.%s"

FileMask := LOG_ALL | USER | DEBUG | MATCHING

ConsoleMask := LOG_ALL | USER | DEBUG | MATCHING

#FileMask := ERROR | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP

#ConsoleMask := ERROR | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP

#FileMask := LOG_ALL | USER | DEBUG | MATCHING

#ConsoleMask := LOG_ALL | USER | DEBUG | MATCHING

FileMask := ERROR | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP

ConsoleMask := ERROR | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP

LogSourceInfo := Stack

LogEntityName:= Yes

LogEventTypes:= Yes
@@ -59,7 +58,7 @@ LogEventTypes:= Yes 
#   secured_mode           : Set to 1 if message exchanges shall be signed

#   encrypted_mode         : Set to 1 if message exchanges shall be encrypted

#                            NOTE: For signed & encrypted message exchanges, both secured_mode and encrypted_mode shall be set to 1

#   secure_db_path         : Path to the certificates and keys storage location

#   sec_db_path            : Path to the certificates and keys storage location

#   hash                   : Hash algorithm to be used when secured mode is set

#                            Authorized values are SHA-256 or SHA-384

#                            Default: SHA-256
@@ -101,8 +100,7 @@ LogEventTypes:= Yes 
#     save_mode   : Set to 1 to save sent packet, 0 otherwise



# Single GeoNetworking component port

#system.geoNetworkingPort.params := "GN(ll_address=4C5E0C14D2EA,latitude=43551050,longitude=10298730)/ETH(mac_src=080027500f9b)/PCAP(mac_src=080027500f9b,nic=tap0,filter=and ether proto 0x8947)" # Nordsys

system.geoNetworkingPort.params := "GN(ll_address=4C5E0C14D2EA,latitude=43551050,longitude=10298730)/ETH(mac_src=080027d6c900)/PCAP(mac_src=080027d6c900,nic=eth2,filter=and ether proto 0x8947)" # Siemens

system.geoNetworkingPort.params := "GN(ll_address=4C5E0C14D2EA,latitude=43551050,longitude=10298730)/ETH(mac_src=080027500f9b)/PCAP(mac_src=080027500f9b,nic=tap0,filter=and ether proto 0x8947)"



# Multiple GeoNetworking component portN

NodeA.geoNetworkingPort.params := "GN(ll_address=F8CAB808391A,latitude=43551050,longitude=10298730)/ETH(mac_src=080027500f9a)/PCAP(mac_src=080027500f9a,nic=tap0,filter=and ether proto 0x8947)"
@@ -112,11 +110,10 @@ NodeD.geoNetworkingPort.params := "GN(ll_address=F8CAB808391D,latitude=43551050, 


# UpperTester port based on UDP

#system.utPort.params := "UT_GN/UDP(dst_ip=192.168.2.2)"

#system.utPort.params := "UT_GN/UDP(dst_ip=172.23.0.1,dst_port=8000)" # Nordsys

system.utPort.params := "UT_GN/UDP(dst_ip=172.16.9.104,dst_port=12345)" # Siemens

system.utPort.params := "UT_GN/UDP(dst_ip=172.23.0.1,dst_port=8000)"



[EXECUTE]

ItsGeoNetworking_TestCases.TC_GEONW_FDV_BAH_BV_01

#ItsGeoNetworking_TestCases.TC_GEONW_FDV_BAH_BV_01

#ItsGeoNetworking_TestCases.TC_GEONW_FDV_COH_BV_01

#ItsGeoNetworking_TestCases.TC_GEONW_FDV_COH_BV_02

#ItsGeoNetworking_TestCases.TC_GEONW_FDV_COH_BV_03
@@ -199,3 +196,4 @@ KillTimer := 10.0 
LocalAddress := 127.0.0.1

TCPPort := 12000

NumHCs := 1