Commit a36766e8 authored by garciay's avatar garciay
Browse files

AtsDENM validation with Nordsys

parent 676f2d38
......@@ -255,6 +255,9 @@ int uppertester_cam_codec::decode (const OCTETSTRING& data, LibItsCam__TypesAndV
msg.utCamChangePositionResult() = BOOLEAN(*(ptr + 1) == 0x01);
} else if (*ptr == uppertester_cam_codec::c_utCamTriggerResult) {
msg.utCamTriggerResult() = BOOLEAN(*(ptr + 1) == 0x01);
} else if (*ptr == 0x24) { // TODO Use a constant for "Peer does not support is "Peer does not support the command"
// Peer does not support the command
msg.utCamInitializeResult() = 0x00;
} else {
loggers::get_instance().warning("uppertester_cam_codec::decode: Unsupported result");
return -1;
......
......@@ -283,6 +283,9 @@ int uppertester_denm_codec::decode (const OCTETSTRING& data, LibItsDenm__TypesAn
os = OCTETSTRING(2, ptr);
r.actionId().sequenceNumber() = oct2int(os);
msg.utDenmUpdateResult() = r;
} else if (*ptr == 0x24) { // TODO Use a constant for "Peer does not support is "Peer does not support the command"
// Peer does not support the command
msg.utDenmInitializeResult() = 0x00;
} else {
loggers::get_instance().warning("uppertester_denm_codec::decode: Unsupported result");
}
......
......@@ -160,8 +160,12 @@ int uppertester_geonetworking_codec::decode (const OCTETSTRING& data, LibItsGeoN
msg.utGnChangePositionResult() = BOOLEAN(*(ptr + 1) == 0x01);
} else if (*ptr == uppertester_geonetworking_codec::c_utGnTriggerResult) {
msg.utGnTriggerResult() = BOOLEAN(*(ptr + 1) == 0x01);
} else if (*ptr == 0x24) { // TODO Use a constant for "Peer does not support is "Peer does not support the command"
// Peer does not support the command
msg.utGnInitializeResult() = 0x00;
} else {
TTCN_warning("uppertester_geonetworking_codec::decode: Unsupported result");
loggers::get_instance().warning("uppertester_geonetworking_codec::decode: Unsupported result");
return -1;
}
loggers::get_instance().log_msg("<<< uppertester_geonetworking_codec::decode", msg);
......
......@@ -90,15 +90,15 @@ 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,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
#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=192.168.2.3,dst_port=8000)"
#system.utPort.params := "UT_CAM/UDP(dst_ip=172.23.0.1,dst_port=8000)" # Nordsys
#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
ItsCam_TestCases.TC_CAM_MSD_FMT_BV_01
#ItsCam_TestCases.TC_CAM_MSD_FMT_BV_02
#ItsCam_TestCases.TC_CAM_MSD_FMT_BV_03
#ItsCam_TestCases.TC_CAM_MSD_FMT_BV_04
......@@ -145,7 +145,7 @@ system.utPort.params := "UT_CAM/UDP(dst_ip=192.168.2.3,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_MSD_SSP_BO_02
#ItsCam_TestCases.TC_CAM_MSD_SSP_BO_02
#ItsCam_TestCases.TC_CAM_MSP_BV_01
[MAIN_CONTROLLER]
......
......@@ -93,11 +93,17 @@ system.denmPort.params := "DENM(next_header=btpB,header_type=tsb)/BTP(dst_port=2
system.utPort.params := "UT_DENM/UDP(dst_ip=172.23.0.1,dst_port=8000)"
[EXECUTE]
ItsDenm_TestCases.TC_DEN_MSGF_BV_01
#ItsDenm_TestCases.TC_DEN_MSGF_BV_01
#ItsDenm_TestCases.TC_DEN_MSGF_BV_02
#ItsDenm_TestCases.TC_DEN_EVGN_BV_03
#ItsDenm_TestCases.TC_DEN_EVGN_BV_04
#ItsDenm_TestCases.TC_DEN_EVUP_BV_01
#ItsDenm_TestCases.TC_DEN_EVUP_BO_04
ItsDenm_TestCases.TC_DEN_EVTR_BV_01
[MAIN_CONTROLLER]
# The options herein control the behavior of MC.
KillTimer := 10.0
LocalAddress := 127.0.0.1
TCPPort := 12000
TCPPort := 12001
NumHCs := 1
......@@ -125,7 +125,7 @@ system.utPort.params := "UT_PKI/UDP(dst_ip=172.23.0.1,dst_port=8000)"
#ItsPki_TestCases.TC_SEC_PKI_ITSS_ENR_BV_01
#ItsPki_TestCases.TC_SEC_PKI_ITSS_ENR_BV_02
#ItsPki_TestCases.TC_SEC_PKI_SND_EA_BV_01
#ItsPki_TestCases.TC_SEC_PKI_SND_EA_BV_02
ItsPki_TestCases.TC_SEC_PKI_SND_EA_BV_02
#ItsPki_TestCases.TC_SEC_PKI_SND_EA_BV_03
#ItsPki_TestCases.TC_SEC_PKI_SND_EA_BV_04
#ItsPki_TestCases.TC_SEC_PKI_SND_EA_BV_05
......@@ -134,7 +134,7 @@ system.utPort.params := "UT_PKI/UDP(dst_ip=172.23.0.1,dst_port=8000)"
#ItsPki_TestCases.TC_SEC_PKI_SND_EA_BV_08
#ItsPki_TestCases.TC_SEC_PKI_SND_EA_BV_09
#ItsPki_TestCases.TC_SEC_PKI_SND_EA_BV_10
ItsPki_TestCases.TC_SEC_PKI_SND_EA_BV_11
#ItsPki_TestCases.TC_SEC_PKI_SND_EA_BV_11
#ItsPki_TestCases.TC_SEC_PKI_SND_EA_BV_12
[MAIN_CONTROLLER]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment