Commit 446bbeba authored by garciay's avatar garciay
Browse files

Start validation of TD_AUTO_IOT_DENM_RWW_BV_01

parent 62aabdae

etc/AtsAutoInterop/AtsAutoInterop.cfg

+4 −5
Original line number Diff line number Diff line
@@ -82,11 +82,11 @@ LogEventTypes:= Yes 
#     save_mode   : 1 to save sent packet, 0 otherwise



# GeoNetworking component port using Commsignia layer

NodeB.geoNetworkingPort.params := "GN(ll_address=04e548000001,latitude=43551050,longitude=10298730,beaconing=0,expiry=1000,its_aid=141)/COMMSIGNIA(mac_src=04e548000001,mac_bc=FFFFFFFFFFFF,eth_type=8947,target_host=10.200.1.101,target_port=7942,source_port=7943,its_aid=141,interface_id=2,tx_power=-32)/UDP(dst_ip=192.168.56.1,dst_port=12346,src_ip=192.168.156.4,src_port=12345)/ETH(mac_src=04e548000001,mac_dst=0A0027000011,eth_type=0800)/PCAP(mac_src=04e548000001,file=/home/ubuntu/TriesAndDelete/etsi_its/testdata/TC_AUTO_IOT_DENM_RWW_BV_01_short.pcap,filter=and (udp port 30000 or udp port 7943))"

NodeC.geoNetworkingPort.params := "GN(ll_address=70b3d5791b48,latitude=43551050,longitude=10298730,beaconing=0,expiry=1000,its_aid=141)/COMMSIGNIA(mac_src=70b3d5791b48,mac_bc=FFFFFFFFFFFF,eth_type=8947,target_host=10.200.1.101,target_port=7942,source_port=7943,its_aid=141,interface_id=2,tx_power=-32)/UDP(dst_ip=192.168.56.1,dst_port=12346,src_ip=192.168.156.4,src_port=12345)/ETH(mac_src=70b3d5791b48,mac_dst=0A0027000011,eth_type=0800)/PCAP(mac_src=70b3d5791b48,file=/home/ubuntu/TriesAndDelete/etsi_its/testdata/TC_AUTO_IOT_DENM_RWW_BV_01_short.pcap,filter=and (udp port 30000 or udp port 7943))"

NodeB.geoNetworkingPort.params := "GN(ll_address=04e548000001,latitude=43551050,longitude=10298730,beaconing=0,expiry=1000,its_aid=141)/COMMSIGNIA(mac_src=04e548000001,mac_bc=FFFFFFFFFFFF,eth_type=8947,target_host=10.200.1.101,target_port=7942,source_port=7943,its_aid=141,interface_id=2,tx_power=-32)/UDP(dst_ip=192.168.56.1,dst_port=12346,src_ip=192.168.156.4,src_port=12345)/ETH(mac_src=04e548000001,mac_dst=0A0027000011,eth_type=0800)/PCAP(mac_src=04e548000001,file=/home/vagrant/TriesAndDelete/etsi_its/testdata/TC_AUTO_IOT_DENM_RWW_BV_01_short.pcap,filter=and (udp port 30000 or udp port 7943))"

NodeC.geoNetworkingPort.params := "GN(ll_address=70b3d5791b48,latitude=43551050,longitude=10298730,beaconing=0,expiry=1000,its_aid=141)/COMMSIGNIA(mac_src=70b3d5791b48,mac_bc=FFFFFFFFFFFF,eth_type=8947,target_host=10.200.1.101,target_port=7942,source_port=7943,its_aid=141,interface_id=2,tx_power=-32)/UDP(dst_ip=192.168.56.1,dst_port=12346,src_ip=192.168.156.4,src_port=12345)/ETH(mac_src=70b3d5791b48,mac_dst=0A0027000011,eth_type=0800)/PCAP(mac_src=70b3d5791b48,file=/home/vagrant/TriesAndDelete/etsi_its/testdata/TC_AUTO_IOT_DENM_RWW_BV_01_short.pcap,filter=and (udp port 30000 or udp port 7943))"

# GeoNetworking component port

#NodeB.geoNetworkingPort.params := "GN(ll_address=04e548000001,latitude=43551050,longitude=10298730,beaconing=0,expiry=1000,its_aid=141)/ETH(mac_src=04e548000001,mac_dst=0A0027000011,eth_type=0800)/PCAP(mac_src=04e548000001,file=/home/ubuntu/TriesAndDelete/etsi_its/testdata/TC_AUTO_IOT_DENM_RWW_BV_01.pcap,filter=and ether src 04e548000001)"

#NodeC.geoNetworkingPort.params := "GN(ll_address=70b3d5791b48,latitude=43551050,longitude=10298730,beaconing=0,expiry=1000,its_aid=141)/ETH(mac_src=70b3d5791b48,mac_dst=0A0027000011,eth_type=0800)/PCAP(mac_src=70b3d5791b48,file=/home/ubuntu/TriesAndDelete/etsi_its/testdata/TC_AUTO_IOT_DENM_RWW_BV_01.pcap,filter=and  ether src 70b3d5791b48)"

#NodeB.geoNetworkingPort.params := "GN(ll_address=04e548000001,latitude=43551050,longitude=10298730,beaconing=0,expiry=1000,its_aid=141)/ETH(mac_src=04e548000001,mac_dst=0A0027000011,eth_type=0800)/PCAP(mac_src=04e548000001,file=/home/vagrant/TriesAndDelete/etsi_its/testdata/TC_AUTO_IOT_DENM_RWW_BV_01.pcap,filter=and ether src 04e548000001)"

#NodeC.geoNetworkingPort.params := "GN(ll_address=70b3d5791b48,latitude=43551050,longitude=10298730,beaconing=0,expiry=1000,its_aid=141)/ETH(mac_src=70b3d5791b48,mac_dst=0A0027000011,eth_type=0800)/PCAP(mac_src=70b3d5791b48,file=/home/vagrant/TriesAndDelete/etsi_its/testdata/TC_AUTO_IOT_DENM_RWW_BV_01.pcap,filter=and  ether src 70b3d5791b48)"



# UpperTester port based on UDP 

system.utPort.params := "UT_GN/UDP(dst_ip=192.168.1.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)"
@@ -101,4 +101,3 @@ TCPPort := 0 
LocalAddress := 127.0.0.1

TCPPort := 12000

NumHCs := 1

etc/TestCodec/TestCodec.cfg

+4 −3
Original line number Diff line number Diff line
@@ -12,9 +12,9 @@ LibItsGeoNetworking_Pics.PICS_GN_LOCAL_GN_ADDR := { 
LibItsCommon_Pixits.PX_IUT_STATION_ID := 10143;



# GeoNetwoking only, no facility layer

LibItsGeoNetworking_Pixits.PX_GN_UPPER_LAYER := e_any

#LibItsGeoNetworking_Pixits.PX_GN_UPPER_LAYER := e_any

# With facility layer

#LibItsGeoNetworking_Pixits.PX_GN_UPPER_LAYER := e_btpA

LibItsGeoNetworking_Pixits.PX_GN_UPPER_LAYER := e_btpB



[LOGGING]

# In this section you can specify the name of the log file and the classes of events
@@ -127,6 +127,7 @@ system.utPort.params := "UT_GN/UDP(dst_ip=192.168.56.1,dst_port=12346,src_ip=192 
#TestCodec_GeoNetworking.tc_GeoNetInd_AnycastPacket

#TestCodec_GeoNetworking.tc_GeoNetInd_BroadcastPacket

#TestCodec_GeoNetworking.tc_GeoNetInd_ShbPacket

TestCodec_GeoNetworking.tc_GeoNetInd_ShbPacket_1

#TestCodec_GeoNetworking.tc_GeoNetInd_UnicastPacket

#TestCodec_GeoNetworking.tc_GeoNetInd_BeaconPacket

# GeoNetworking AC port
@@ -142,7 +143,7 @@ system.utPort.params := "UT_GN/UDP(dst_ip=192.168.56.1,dst_port=12346,src_ip=192 
#TestCodec_GeoNetworking.tc_GeoNet_Port_1          # Use simulator of file to run this test

                                                   # Used to test device_mode=0,beaconing=1,beacon codec

                                                   # No startPassBeaconing

TestCodec_GeoNetworking.tc_GeoNet_Port_2          # Use simulator of file to run this test

#TestCodec_GeoNetworking.tc_GeoNet_Port_2          # Use simulator of file to run this test

                                                   # Used to test device_mode=0,beaconing=1,beacon codec

                                                   # With startPassBeaconing

#TestCodec_GeoNetworking.tc_GeoNet_MultiPort     # Use simulator or file to run this test

ttcn/AtsAutoInterop/ItsAutoInterop_Functions.ttcn

+19 −11
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ module ItsAutoInterop_Functions { 
                map(p_eut:hmiPort, system:hmiPort); 

            }

            map(p_eut:geoNetworkingPort, system:geoNetworkingPort);

            connect(p_eut:syncPort, self:syncPort);

            

            //activate(a_cfPtcDown()); // FIXME To be done
@@ -166,10 +165,10 @@ module ItsAutoInterop_Functions { 
        ) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsAutoInteropGeoNetworkingSystem */ {

          

            // Create components

            p_eut1 := ItsAutoInteropGeonetworking.create(c_compNodeB); 

            p_eut2 := ItsAutoInteropGeonetworking.create(c_compNodeC);

            p_eut3 := ItsAutoInteropGeonetworking.create(c_compNodeD);

            p_eut4 := ItsAutoInteropGeonetworking.create(c_compNodeE);

            p_eut1 := ItsAutoInteropGeonetworking.create(c_compNodeB) alive;

            p_eut2 := ItsAutoInteropGeonetworking.create(c_compNodeC) alive;

            p_eut3 := ItsAutoInteropGeonetworking.create(c_compNodeD) alive;

            p_eut4 := ItsAutoInteropGeonetworking.create(c_compNodeE) alive;

            

            // Map & Connect

            if (PX_CAPTURE_MODE == "on-link") {
@@ -177,6 +176,10 @@ module ItsAutoInterop_Functions { 
                map(self:utPort, system:utPort);

            }

            connect(self:syncPort, mtc:syncPort);

            connect(p_eut1:syncPort, self:syncPort);

            connect(p_eut2:syncPort, self:syncPort);

            connect(p_eut3:syncPort, self:syncPort);

            connect(p_eut4:syncPort, self:syncPort);

            

            // EUT1/EUT2/EUT3/EUT4

            connect(p_eut1:eutGeoNetworkingPort, p_eut2:eutGeoNetworkingPort); // EUT1 & EUT2 are on-link
@@ -210,6 +213,8 @@ module ItsAutoInterop_Functions { 
                map(self:utPort, system:utPort); 

            }

            connect(self:syncPort, mtc:syncPort);

            connect(p_eut1:syncPort, self:syncPort);

            connect(p_eut2:syncPort, self:syncPort);

            

            // EUT1/EUT2

            connect(p_eut1:eutGeoNetworkingPort, p_eut2:eutGeoNetworkingPort);
@@ -232,9 +237,9 @@ module ItsAutoInterop_Functions { 
        ) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsAutoInteropGeoNetworkingSystem */ {

          

            // Create components

            p_eut1 := ItsAutoInteropGeonetworking.create(c_compNodeB); 

            p_eut2 := ItsAutoInteropGeonetworking.create(c_compNodeC);

            p_eut3 := ItsAutoInteropGeonetworking.create(c_compNodeD);

            p_eut1 := ItsAutoInteropGeonetworking.create(c_compNodeB) alive;

            p_eut2 := ItsAutoInteropGeonetworking.create(c_compNodeC) alive;

            p_eut3 := ItsAutoInteropGeonetworking.create(c_compNodeD) alive;

            

            // Map & Connect

            if (PX_CAPTURE_MODE == "on-link") {
@@ -242,6 +247,9 @@ module ItsAutoInterop_Functions { 
                map(self:utPort, system:utPort); 

            }

            connect(self:syncPort, mtc:syncPort);

            connect(p_eut1:syncPort, self:syncPort);

            connect(p_eut2:syncPort, self:syncPort);

            connect(p_eut3:syncPort, self:syncPort);

            

            // EUT1/EUT2/EUT3

            connect(p_eut1:eutGeoNetworkingPort, p_eut2:eutGeoNetworkingPort);
@@ -501,8 +509,8 @@ module ItsAutoInterop_Functions { 
                            in LongPosVector p_pointA,

                            in LongPosVector p_pointB

        ) return float {

         

//            log("*** f_distance: INFO: calling fx_computeDistance() ***");

          log("*** f_distance: INFO: calling PointA: ", p_pointA);

          log("*** f_distance: INFO: calling PointB: ", p_pointB);

          return fx_computeDistance(p_pointA.latitude, p_pointA.longitude, p_pointB.latitude, p_pointB.longitude);

        }

ttcn/AtsAutoInterop/ItsAutoInterop_Pics.ttcn

+6 −6
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ module ItsAutoInterop_Pics { 
     * @see  TODO

     */

    modulepar ThreeDLocation PICS_POS1 := {

        latitude                                        := 435522970,

        longitude                                       := 103000170,

        latitude                                        := 435525352,

        longitude                                       := 103000415,

        elevation                                       := 0

    }
@@ -102,8 +102,8 @@ module ItsAutoInterop_Pics { 
     * @see  TODO

     */

    modulepar ThreeDLocation PICS_POS2 := {

        latitude                                        := 435522970,

        longitude                                       := 103000170,

        latitude                                        := 435519107,

        longitude                                       := 102993930,

        elevation                                       := 0

    }
@@ -112,8 +112,8 @@ module ItsAutoInterop_Pics { 
     * @see  TODO

     */

    modulepar ThreeDLocation PICS_POS3 := {

        latitude                                        := 435522970,

        longitude                                       := 103000170,

        latitude                                        := 435513421,

        longitude                                       := 102986038,

        elevation                                       := 0

    }