Commit 7754aded authored by garciay's avatar garciay
Browse files

ASN.1 Changes due to latest asn1c github version

Enhance UdpLayer
Bug fixed on CAM/DENM/BTP layers (TODO GeoNetworking LAYER)
Validation basic test cases for CAM/DENM/GeoNetworking
parent a239bb00
Loading
Loading
Loading
Loading
+16 −118
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ LibItsGeoNetworking_Pics.PICS_GN_LOCAL_GN_ADDR := {
  typeOfAddress := e_initial,
  stationType := e_passengerCar,
  stationCountryCode := 0,
  mid := '92569202017a'O
  mid := '001C6B00FF51'O
}

LibItsGeoNetworking_Pixits.PX_GN_UPPER_LAYER := e_any
@@ -37,16 +37,17 @@ LogEventTypes:= Yes
#   beaconing              : Set to 1 if GnLayer shall start beaconing
#   Beaconning timer expiry: expiry (ms)
# Ethernet layer
#   Source MAC address: mac_src
#   Source MAC address of the TestSystem : mac_src
#   Broadcast address                    : mac_bc
#   Ethernet type     : eth_type
#   Ethernet type for ITS                : eth_type
# UDP layer (IP/UDP based on Pcap)
#   dst_ip  : destination IPv4 address (aa.bb.cc.dd)
#   dst_ip  : destination IPv4 address (aa.bb.cc.dd), the IUT
#   dst_port: destination port
#   src_ip  : source IPv4 address (aa.bb.cc.dd)
#   src_ip  : source IPv4 address (aa.bb.cc.dd), the TestSystem
#   src_port: source port
# Pcap layer
#   Pcap filter : filter
#   mac_src     : used to exclude TestSystem sent message from the capture
#   Online mode :
#     Local NIC : nic
#                 If set, online mode is used
@@ -56,116 +57,14 @@ LogEventTypes:= Yes
#     Time offset     : time_offset
#     Save sent packet: save_mode=[0|1]

# Single GeoNetworking component port
system.geoNetworkingPort.params := "GN(ll_address=F8CAB8083918,latitude=43551050,longitude=10298730,beaconing=0,expiry=1000,its_aid=141)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=BABEBABE0002,nic=,file=/home/ubuntu/tmp/TC_GEONW_PON_BEA_TI_02.pcap,filter=ether proto 0x8947,frame_offset=0,save_mode=1)"
#system.geoNetworkingPort.params := "GN(ll_address=F8CAB8083918,latitude=43551050,longitude=10298730,beaconing=0,expiry=1000,its_aid=141)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=F8CAB8083918,nic=,file=/home/ubuntu/tmp/test_beacon.pcap,filter=ether proto 0x8947,frame_offset=0,save_mode=1)"
#system.geoNetworkingPort.params := "GN(ll_address=F8CAB8083918,latitude=43551050,longitude=10298730,beaconing=0,expiry=1000,its_aid=141)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=F8CAB8083918,nic=enp0s8,file=,filter=ether proto 0x8947,frame_offset=0,save_mode=0)"
system.camPort.params := "CAM/BTP(type=btpB,dst_port=2001,src_port=0)/GN(ll_address=0800275c4959,latitude=43551050,longitude=10298730,expiry=1000,its_aid=141)/ETH(mac_src=0800275c4959,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=0800275c4959,nic=enp0s8,filter=and ether proto 0x8947)"

# Multiple GeoNetworking component port
Comp1.geoNetworkingPort.params := "GN(ll_address=F8CAB8083919,latitude=43551050,longitude=10298730,beaconing=1,expiry=1000,its_aid=141)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=F8CAB8083919,nic=,file=/home/ubuntu/tmp/test_1_cam.pcap,filter=ether proto 0x8947,frame_offset=0,save_mode=0)"
Comp2.geoNetworkingPort.params := "GN(ll_address=F8CAB808391A,latitude=43551050,longitude=10298730,beaconing=1,expiry=1000,its_aid=141)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=F8CAB808391A,nic=,file=/home/ubuntu/tmp/test_1_cam.pcap,filter=ether proto 0x8947,frame_offset=0,save_mode=0)"

# BTP port
system.btpPort.params := "BTP(type=btpB,dst_port=2000,src_port=0)/GN(ll_address=F8CAB8083918,latitude=43551050,longitude=10298730,expiry=1000,its_aid=141)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=F8CAB8083918,nic=,file=/home/ubuntu/tmp/test_1_cam.pcap,filter=ether proto 0x8947,frame_offset=0)"

# CAM port
system.camPort.params := "CAM/BTP(type=btpA,dst_port=2000,src_port=0)/GN(ll_address=F8CAB8083918,latitude=43551050,longitude=10298730,expiry=1000,its_aid=141)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=F8CAB8083918,nic=,file=/home/ubuntu/tmp/test_1_cam.pcap,filter=ether proto 0x8947,frame_offset=0)"

# DENM port
system.denmPort.params := "DENM/BTP(type=btpA,dst_port=2001,src_port=0)/GN(ll_address=F8CAB8083918,latitude=43551050,longitude=10298730,expiry=1000,its_aid=141)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=F8CAB8083918,nic=,file=/home/ubuntu/tmp/test_1_denm.pcap,filter=ether proto 0x8947,frame_offset=0)"

# UpperTester port based on UDP
system.utPort.params := "UT/UDP(dst_ip=192.168.56.1,dst_port=12346,src_ip=192.168.156.4,src_port=12345)/ETH(mac_src=026f8338c1e5,mac_dst=0A0027000011,eth_type=0800)/PCAP(mac_src=0800275c4959,nic=enp0s8,filter=udp port 12346)"
# CAM UpperTester port based on UDP (ETSI Wlan)
system.utPort.params := "UT_CAM/UDP(dst_ip=192.168.0.102,dst_port=12345,src_ip=192.168.0.104,src_port=12345)/ETH(mac_src=0800275c4959,mac_dst=F8CAB8083918,eth_type=0800)/PCAP(mac_src=0800275c4959,nic=enp0s8,filter=and udp port 12345)"

[EXECUTE]
# GeoNetworking Req
#TestCodec_GeoNetworking.tc_GeoNetReq_AnycastPacket
#TestCodec_GeoNetworking.tc_GeoNetReq_BroadcastPacket
#TestCodec_GeoNetworking.tc_GeoNetReq_UnicastPacket
#TestCodec_GeoNetworking.tc_GeoNetReq_BeaconPacket
#TestCodec_GeoNetworking.tc_GeoNetReq_LsRequestPacket
#TestCodec_GeoNetworking.tc_GeoNetReq_LsReplyPacket
# GeoNetworking Ind
#TestCodec_GeoNetworking.tc_GeoNetInd_AnycastPacket
#TestCodec_GeoNetworking.tc_GeoNetInd_BroadcastPacket
#TestCodec_GeoNetworking.tc_GeoNetInd_ShbPacket
#TestCodec_GeoNetworking.tc_GeoNetInd_UnicastPacket
#TestCodec_GeoNetworking.tc_GeoNetInd_BeaconPacket
# GeoNetworking Port
#TestCodec_GeoNetworking.tc_GeoNet_Port
#TestCodec_GeoNetworking.tc_GeoNet_Port_utPort
#TestCodec_GeoNetworking.tc_GeoNet_Port_acPort_lpv
#TestCodec_GeoNetworking.tc_GeoNet_acPort_getLongPositionVector_1
#TestCodec_GeoNetworking.tc_GeoNet_acPort_getLongPositionVector_2
#TestCodec_GeoNetworking.tc_GeoNet_Port_acPort_beaconing_1
#TestCodec_GeoNetworking.tc_GeoNet_Port_acPort_beaconing_2
#TestCodec_GeoNetworking.tc_GeoNet_Port_acPort_pass_beaconing_1
#TestCodec_GeoNetworking.tc_GeoNet_Port_acPort_pass_beaconing_2
#TestCodec_GeoNetworking.tc_GeoNet_MultiPort
#GeoNetworking UpperTester
#TestCodec_GeoNetworking.tc_GeoNet_UtGnInitialize
#TestCodec_GeoNetworking.tc_GeoNet_UtGnChangePosition
#TestCodec_GeoNetworking.tc_GeoNet_UtGnTrigger_GeoUnicast_1
#TestCodec_GeoNetworking.tc_GeoNet_UtGnTrigger_GeoUnicast_2
#TestCodec_GeoNetworking.tc_GeoNet_UtGnTrigger_GeoBroadcast_1
#TestCodec_GeoNetworking.tc_GeoNet_UtGnTrigger_GeoBroadcast_2
#TestCodec_GeoNetworking.tc_GeoNet_UtGnTrigger_GeoAnycast_1
#TestCodec_GeoNetworking.tc_GeoNet_UtGnTrigger_GeoAnycast_2
#TestCodec_GeoNetworking.tc_GeoNet_UtGnTrigger_Shb_1
#TestCodec_GeoNetworking.tc_GeoNet_UtGnTrigger_Shb_2
#TestCodec_GeoNetworking.tc_GeoNet_UtGnTrigger_Tsb_1
#TestCodec_GeoNetworking.tc_GeoNet_UtGnTrigger_Tsb_2

# Btp PDU
#TestCodec_Btp.tc_Btp_A_Without_Payload
#TestCodec_Btp.tc_Btp_A
#TestCodec_Btp.tc_Btp_B
#TestCodec_Btp.tc_BtpReq_A
# Btp Port
#TestCodec_Btp.tc_Btp_Port

# CAM PDU
#TestCodec_CAM.tc_CamReq
#TestCodec_CAM.tc_CamInd
TestCodec_CAM.tc_Cam_Port
# CAM UpperTester
#TestCodec_CAM.tc_Cam_UtCamInitialize
#TestCodec_CAM.tc_Cam_UtCamChangePosition
#TestCodec_CAM.tc_Cam_UtCamChangeCurvature
#TestCodec_CAM.tc_Cam_UtCamChangeSpeed
#TestCodec_CAM.tc_Cam_UtCamSetAccelerationControlStatus
#TestCodec_CAM.tc_Cam_UtCamSetExteriorLightsStatus_lowBeamHeadlightsOn
#TestCodec_CAM.tc_Cam_UtCamSetExteriorLightsStatus_leftTurnSignalOn
#TestCodec_CAM.tc_Cam_UtCamSetExteriorLightsStatus_daytimeRunningLightsOn
#TestCodec_CAM.tc_Cam_UtCamSetExteriorLightsStatus_parkingLightsOn
#TestCodec_CAM.tc_Cam_UtCamChangeHeading
#TestCodec_CAM.tc_Cam_UtCamSetDriveDirection
#TestCodec_CAM.tc_Cam_UtCamChangeYawRate
#TestCodec_CAM.tc_Cam_UtCamChangeYawRate_negative
#TestCodec_CAM.tc_Cam_UtCamSetStationType
#TestCodec_CAM.tc_Cam_UtCamSetVehicleRole
#TestCodec_CAM.tc_Cam_UtCamSetDangerousGoods
#TestCodec_CAM.tc_Cam_UtCamSetLightBarSirene
#TestCodec_CAM.tc_Denm_UtCamTriggerResult
#TestCodec_CAM.tc_Cam_UtCamEventInd_1
#TestCodec_CAM.tc_Cam_UtCamEventInd_2

# DENM PDU
#TestCodec_DENM.tc_DenmReq
#TestCodec_DENM.tc_DenmInd
TestCodec_DENM.tc_Denm_Port
#TestCodec_DENM.tc_Denm_Port_utPort
# DENM UpperTester
#TestCodec_DENM.tc_Denm_UtDenmInitialize
#TestCodec_DENM.tc_Denm_UtDenmChangePosition
#TestCodec_DENM.tc_Denm_UtDenmChangePseudonym
#TestCodec_DENM.tc_Denm_UtDenmTrigger_1
#TestCodec_DENM.tc_Denm_UtDenmTrigger_2
#TestCodec_DENM.tc_Denm_UtDenmUpdate_1
#TestCodec_DENM.tc_Denm_UtDenmTriggerResult
#TestCodec_DENM.tc_Denm_UtDenmUpdateResult
#TestCodec_DENM.tc_Denm_UtDenmEventInd_1
#TestCodec_DENM.tc_Denm_UtDenmEventInd_2
#ItsCam_TestCases.TC_CAM_MSD_FMT_BV_01
ItsCam_TestCases.TC_CAM_MSD_FMT_BV_02

[MAIN_CONTROLLER]
# The options herein control the behavior of MC.
@@ -174,4 +73,3 @@ TCPPort := 0
LocalAddress := 127.0.0.1
TCPPort := 12000
NumHCs := 1
+22 −18
Original line number Diff line number Diff line
@@ -57,22 +57,19 @@ LogEventTypes:= Yes
#     Save sent packet: save_mode=[0|1]

# Single GeoNetworking component port
system.geoNetworkingPort.params := "GN(ll_address=F8CAB8083918,latitude=43551050,longitude=10298730,beaconing=0,expiry=1000,its_aid=141)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=BABEBABE0002,nic=,file=/home/ubuntu/tmp/TC_GEONW_PON_BEA_TI_02.pcap,filter=and ether proto 0x8947,frame_offset=0,save_mode=1)"
#system.geoNetworkingPort.params := "GN(ll_address=F8CAB8083918,latitude=43551050,longitude=10298730,beaconing=0,expiry=1000,its_aid=141)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=F8CAB8083918,nic=,file=/home/ubuntu/tmp/test_beacon.pcap,filter=and ether proto 0x8947,frame_offset=0,save_mode=1)"
#system.geoNetworkingPort.params := "GN(ll_address=F8CAB8083918,latitude=43551050,longitude=10298730,beaconing=0,expiry=1000,its_aid=141)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=F8CAB8083918,nic=enp0s8,file=,filter=and ether proto 0x8947,frame_offset=0,save_mode=0)"

system.geoNetworkingPort.params := "GN(ll_address=F8CAB8083918,latitude=43551050,longitude=10298730,beaconing=0,expiry=1000,its_aid=141)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=BABEBABE0002,nic=,file=../../../testdata/test_1_beacon.pcap,filter=and ether proto 0x8947,frame_offset=0,save_mode=1)"
# Multiple GeoNetworking component port
Comp1.geoNetworkingPort.params := "GN(ll_address=F8CAB8083919,latitude=43551050,longitude=10298730,beaconing=1,expiry=1000,its_aid=141)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=F8CAB8083919,nic=,file=/home/ubuntu/tmp/test_1_cam.pcap,filter=and ether proto 0x8947,frame_offset=0,save_mode=0)"
Comp1.geoNetworkingPort.params := "GN(ll_address=F8CAB8083919,latitude=43551050,longitude=10298730,beaconing=1,expiry=1000,its_aid=141)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=F8CAB8083919,nic=,file=../../../testdata/test_1_cam.pcap,filter=and ether proto 0x8947,frame_offset=0,save_mode=0)"
Comp2.geoNetworkingPort.params := "GN(ll_address=F8CAB808391A,latitude=43551050,longitude=10298730,beaconing=1,expiry=1000,its_aid=141)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=F8CAB808391A,nic=,file=/home/ubuntu/tmp/test_1_cam.pcap,filter=and ether proto 0x8947,frame_offset=0,save_mode=0)"

# BTP port
system.btpPort.params := "BTP(type=btpB,dst_port=2000,src_port=0)/GN(ll_address=F8CAB8083918,latitude=43551050,longitude=10298730,expiry=1000,its_aid=141)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=F8CAB8083918,nic=,file=/home/ubuntu/tmp/test_1_cam.pcap,filter=and ether proto 0x8947,frame_offset=0)"
system.btpPort.params := "BTP(type=btpB,dst_port=2000,src_port=0)/GN(ll_address=F8CAB8083918,latitude=43551050,longitude=10298730,expiry=1000,its_aid=141)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=F8CAB8083918,nic=,file=../../../testdata/test_1_cam.pcap,filter=and ether proto 0x8947,frame_offset=0)"

# CAM port
system.camPort.params := "CAM/BTP(type=btpA,dst_port=2000,src_port=0)/GN(ll_address=F8CAB8083918,latitude=43551050,longitude=10298730,expiry=1000,its_aid=141)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=F8CAB8083918,nic=,file=/home/ubuntu/tmp/test_1_cam.pcap,filter=and ether proto 0x8947,frame_offset=0)"
system.camPort.params := "CAM/BTP(type=btpA,dst_port=2001,src_port=0)/GN(ll_address=F8CAB8083918,latitude=43551050,longitude=10298730,expiry=1000,its_aid=141)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=F8CAB8083918,nic=,file=../../../testdata/test_1_cam.pcap,save_mode=1,filter=and ether proto 0x8947,frame_offset=0)"

# DENM port
system.denmPort.params := "DENM/BTP(type=btpA,dst_port=2001,src_port=0)/GN(ll_address=F8CAB8083918,latitude=43551050,longitude=10298730,expiry=1000,its_aid=141)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=F8CAB8083918,nic=,file=/home/ubuntu/tmp/test_1_denm.pcap,filter=and ether proto 0x8947,frame_offset=0)"
system.denmPort.params := "DENM/BTP(type=btpA,dst_port=2002,src_port=0)/GN(ll_address=F8CAB8083918,latitude=43551050,longitude=10298730,expiry=1000,its_aid=141)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=F8CAB8083918,nic=,file=../../../testdata/test_1_denm.pcap,save_mode=1,filter=and ether proto 0x8947,frame_offset=0)"

# GeoNetworking UpperTester port based on UDP 
system.utPort.params := "UT_GN/UDP(dst_ip=192.168.56.1,dst_port=12346,src_ip=192.168.156.4,src_port=12345)/ETH(mac_src=026f8338c1e5,mac_dst=0A0027000011,eth_type=0800)/PCAP(mac_src=0800275c4959,nic=enp0s8,filter=and udp port 12346)"
@@ -91,9 +88,11 @@ system.utPort.params := "UT_GN/UDP(dst_ip=192.168.56.1,dst_port=12346,src_ip=192
#TestCodec_GeoNetworking.tc_GeoNetInd_ShbPacket
#TestCodec_GeoNetworking.tc_GeoNetInd_UnicastPacket
#TestCodec_GeoNetworking.tc_GeoNetInd_BeaconPacket
# GeoNetworking Port
# GeoNetworking port tests
# To run the GeoNetworking port tests, use the offline mode and the test data provided. Use PcapLayer.save_mode to save sent packet into a file
#TestCodec_GeoNetworking.tc_GeoNet_Port
#TestCodec_GeoNetworking.tc_GeoNet_Port_utPort
TestCodec_GeoNetworking.tc_GeoNet_Port_utPort
# GeoNetworking AC port
#TestCodec_GeoNetworking.tc_GeoNet_Port_acPort_lpv
#TestCodec_GeoNetworking.tc_GeoNet_acPort_getLongPositionVector_1
#TestCodec_GeoNetworking.tc_GeoNet_acPort_getLongPositionVector_2
@@ -124,9 +123,11 @@ system.utPort.params := "UT_GN/UDP(dst_ip=192.168.56.1,dst_port=12346,src_ip=192
# Btp Port
#TestCodec_Btp.tc_Btp_Port

# CAM PDU
# CAM PDU tests
#TestCodec_CAM.tc_CamReq
#TestCodec_CAM.tc_CamInd
# CAM port tests
# To run the CAM port tests, use the offline mode and the test data provided. Use PcapLayer.save_mode to save sent packet into a file
#TestCodec_CAM.tc_Cam_Port
# CAM UpperTester
#TestCodec_CAM.tc_Cam_UtCamInitialize
@@ -146,22 +147,25 @@ system.utPort.params := "UT_GN/UDP(dst_ip=192.168.56.1,dst_port=12346,src_ip=192
#TestCodec_CAM.tc_Cam_UtCamSetVehicleRole
#TestCodec_CAM.tc_Cam_UtCamSetDangerousGoods
#TestCodec_CAM.tc_Cam_UtCamSetLightBarSirene
#TestCodec_CAM.tc_Denm_UtCamTriggerResult
#TestCodec_CAM.tc_Cam_UtCamTriggerResult
#TestCodec_CAM.tc_Cam_UtCamEventInd_1
#TestCodec_CAM.tc_Cam_UtCamEventInd_2

# DENM PDU
#TestCodec_DENM.tc_DenmReq
#TestCodec_DENM.tc_DenmInd
# CAM port tests
# To run the DENM port tests, use the offline mode and the test data provided. Use PcapLayer.save_mode to save sent packet into a file
#TestCodec_DENM.tc_Denm_Port
#TestCodec_DENM.tc_Denm_Port_utPort
# DENM UpperTester
TestCodec_DENM.tc_Denm_UtDenmInitialize
TestCodec_DENM.tc_Denm_UtDenmChangePosition
TestCodec_DENM.tc_Denm_UtDenmChangePseudonym
TestCodec_DENM.tc_Denm_UtDenmTrigger_1
TestCodec_DENM.tc_Denm_UtDenmTrigger_2
#TestCodec_DENM.tc_Denm_UtDenmInitialize
#TestCodec_DENM.tc_Denm_UtDenmChangePosition
#TestCodec_DENM.tc_Denm_UtDenmChangePseudonym
#TestCodec_DENM.tc_Denm_UtDenmTrigger_1
#TestCodec_DENM.tc_Denm_UtDenmTrigger_2
#TestCodec_DENM.tc_Denm_UtDenmUpdate_1
#TestCodec_DENM.tc_Denm_UtDenmUpdate_2
#TestCodec_DENM.tc_Denm_UtDenmTriggerResult
#TestCodec_DENM.tc_Denm_UtDenmUpdateResult
#TestCodec_DENM.tc_Denm_UtDenmEventInd_1