Commit 686d1885 authored by garciay's avatar garciay
Browse files

Validate MAPEM testValidate RSUsimulator against AtsMapem in unsecured mode

parent 47f4d24e

javasrc/tool/org/etsi/its/tool/elvior/LibItsMapemSpatem_asn1.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -24,10 +24,10 @@ public class LibItsMapemSpatem_asn1 extends LibIts_asn1 { 
    public Value decode(final TriMessage message, final Type decodingHypothesis) {

    public Value decode(final TriMessage message, final Type decodingHypothesis) {

        _logger.entering("LibItsMapemSpatem_asn1", "decode", decodingHypothesis.getName());

        _logger.entering("LibItsMapemSpatem_asn1", "decode", decodingHypothesis.getName());

        

        

        if (decodingHypothesis.getName().endsWith("mapemPacket")) {

        if (decodingHypothesis.getName().endsWith("MAPEM")) {

            Type type = getTypeForName("MAPEM_PDU_Descriptions.MAPEM");

            Type type = getTypeForName("MAPEM_PDU_Descriptions.MAPEM");

            return super.decode(message, type);

            return super.decode(message, type);

        } else if (decodingHypothesis.getName().endsWith("spatemPacket")) {

        } else if (decodingHypothesis.getName().endsWith("SPATEM")) {

            Type type = getTypeForName("SPATEM_PDU_Descriptions.SPATEM");

            Type type = getTypeForName("SPATEM_PDU_Descriptions.SPATEM");

            return super.decode(message, type);

            return super.decode(message, type);

        }

        }

javasrc/tool/org/etsi/its/tool/elvior/LibIts_asn1.java

+10 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,16 @@ public class LibIts_asn1 implements TciCDProvided { 
        msg.setEncodedMessage(message.getEncodedMessage());

        msg.setEncodedMessage(message.getEncodedMessage());

        if (_logger.isLoggable(Level.ALL)) ByteHelper.dump("LibIts_asn1.decode: ", msg.getEncodedMessage());

        if (_logger.isLoggable(Level.ALL)) ByteHelper.dump("LibIts_asn1.decode: ", msg.getEncodedMessage());

        

        

        String type = String.format("%s.%s", _encodingName, decodingHypothesis.getName());

        String type = null;

        if (_encodingName.equals("MAPEM_SPATEM_ETSI")) {

            if (decodingHypothesis.getName().endsWith("MAPEM")) {

                type = String.format("%s.%s", "MAPEM_PDU_Descriptions", decodingHypothesis.getName());

            } else {

                type = String.format("%s.%s", "SPATEM_PDU_Descriptions", decodingHypothesis.getName());

            }

        } else {

            type = String.format("%s.%s", _encodingName, decodingHypothesis.getName());

        }

        _logger.info("Type: " + type);

        _logger.info("Type: " + type);

        Type asnOriginalType = getTypeForName(type);

        Type asnOriginalType = getTypeForName(type);

        // Check which type class the decoding hypothesis is of

        // Check which type class the decoding hypothesis is of

javasrc/tool/org/etsi/its/tool/elvior/res/ta.properties

+7 −7
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ camPort=BTP/GN/ETH 
# Define the port/layer configuration for DENM

# Define the port/layer configuration for DENM

denmPort=BTP/GN/ETH

denmPort=BTP/GN/ETH

# Define the port/layer configuration for MAPEM-SPATEM

# Define the port/layer configuration for MAPEM-SPATEM

mapmSpatenmPort=BTP/GN/ETH

mapemSpatemPort=BTP/GN/ETH

# Define the port/layer configuration for IVIM

# Define the port/layer configuration for IVIM

ivimPort=BTP/GN/ETH

ivimPort=BTP/GN/ETH

# Define the port/layer configuration for SREM-SSEM

# Define the port/layer configuration for SREM-SSEM
@@ -27,7 +27,7 @@ fsapPort=FSAP/UdpIp 
UpperTesterSettings=172.17.15.38:12345

UpperTesterSettings=172.17.15.38:12345





# Peer ITS station

# Peer ITS station

LinkLayer_Peer=8BADF00D0099

LinkLayer_Peer=8BADF00D0199





# Define the MAC address of the Ethernet interface connected to the IUT device

# Define the MAC address of the Ethernet interface connected to the IUT device

#       Home laptop VMWare MAC address

#       Home laptop VMWare MAC address
@@ -41,15 +41,15 @@ LocalEthernetMAC=00E08F008855 
# Define the Ethernet type value used by the IUT

# Define the Ethernet type value used by the IUT

IutEthernetTypeValue=0x8947

IutEthernetTypeValue=0x8947

# Node Ethernet addresses

# Node Ethernet addresses

LinkLayer_MTC=8BADF00D0000

LinkLayer_MTC=8BADF00D0100

# Link-Layer address of component NodeA

# Link-Layer address of component NodeA

LinkLayer_NodeA=8BADF00D0001

LinkLayer_NodeA=8BADF00D0101

# Link-Layer address of component NodeB

# Link-Layer address of component NodeB

LinkLayer_NodeB=8BADF00D0002

LinkLayer_NodeB=8BADF00D0102

# Link-Layer address of component NodeC

# Link-Layer address of component NodeC

LinkLayer_NodeC=8BADF00D0003

LinkLayer_NodeC=8BADF00D0103

# Link-Layer address of component NodeD

# Link-Layer address of component NodeD

LinkLayer_NodeD=8BADF00D0004

LinkLayer_NodeD=8BADF00D0104

# Interval between each beacon sent by TS (ms)

# Interval between each beacon sent by TS (ms)

TsBeaconInterval=1000

TsBeaconInterval=1000

# Latitude of Test System

# Latitude of Test System