Index: adapter/org/etsi/its/adapter/TestAdapter.java =================================================================== --- adapter/org/etsi/its/adapter/TestAdapter.java (revision 2573) +++ adapter/org/etsi/its/adapter/TestAdapter.java (working copy) @@ -20,7 +20,6 @@ import org.etsi.its.adapter.ports.ProtocolPortFactory; import org.etsi.its.adapter.ports.UpperTesterPort; import org.etsi.ttcn.tci.CharstringValue; -import org.etsi.ttcn.tri.TriActionTemplate; import org.etsi.ttcn.tri.TriAddress; import org.etsi.ttcn.tri.TriAddressList; import org.etsi.ttcn.tri.TriCommunicationSA; @@ -74,7 +73,6 @@ /* (non-Javadoc) * @see org.etsi.ttcn.tri.TriCommunicationSA#triExecuteTestcase(org.etsi.ttcn.tri.TriTestCaseId, org.etsi.ttcn.tri.TriPortIdList) */ - @Override public TriStatus triExecuteTestcase(final TriTestCaseId tcId, final TriPortIdList portList) { return required.getTriStatus(TriStatus.TRI_OK); } @@ -303,15 +301,6 @@ } /** - * triSutActionTemplate not implemented - * @see org.etsi.ttcn.tri.TriCommunicationSA#triSutActionTemplate(org.etsi.ttcn.tri.TriActionTemplate) - */ - @Override - public TriStatus triSutActionTemplate(TriActionTemplate templateValue) { - return required.getTriStatus(TriStatus.TRI_ERROR, "triSutActionTemplate not implemented"); - } - - /** * triMapParam not implemented * @see org.etsi.ttcn.tri.TriCommunicationSA#triMapParam(org.etsi.ttcn.tri.TriPortId, org.etsi.ttcn.tri.TriPortId, org.etsi.ttcn.tri.TriParameterList) */ @@ -328,4 +317,28 @@ public TriStatus triUnmapParam(TriPortId compPortId, TriPortId tsiPortId, TriParameterList paramList) { return required.getTriStatus(TriStatus.TRI_ERROR, "triUnmapParam not implemented"); } + + @Override + public TriStatus triExecuteTestCase(TriTestCaseId arg0, TriPortIdList arg1) { + // TODO Auto-generated method stub + return triExecuteTestcase(arg0, arg1); + } + + @Override + public TriStatus triGetStreamValue(TriComponentId arg0, TriPortId arg1, TriAddress arg2, TriMessage arg3) { + // TODO Auto-generated method stub + return null; + } + + @Override + public TriStatus triSetStreamValue(TriComponentId arg0, TriPortId arg1, TriAddress arg2, TriMessage arg3) { + // TODO Auto-generated method stub + return null; + } + + @Override + public TriStatus triStaticMap(TriPortId arg0, TriPortId arg1) { + // TODO Auto-generated method stub + return null; + } } Index: codec/org/etsi/ttcn/codec/CodecFactory.java =================================================================== --- codec/org/etsi/ttcn/codec/CodecFactory.java (revision 2573) +++ codec/org/etsi/ttcn/codec/CodecFactory.java (working copy) @@ -83,7 +83,7 @@ if(codec != null) { //TERFactory.getInstance().logDebug(String.format("%50s", encoding)); //TERFactory.getInstance().logDebug(" ==> " + codec.getClass().getName()); - System.out.println(String.format("%50s", encoding) + " ==> " + codec.getClass().getName()); + //System.out.println(String.format("%50s", encoding) + " ==> " + codec.getClass().getName()); return codec; } return null; @@ -92,12 +92,12 @@ public ICodec getCodec(MainCodec mainCodec, int classType, String encoding, String typeName) { //TERFactory.getInstance().logDebug(String.format("%50s", typeName + "(" + encoding + ")")); - System.out.println(String.format("%50s", typeName + "(" + encoding + ")")); +// System.out.println(String.format("%50s", typeName + "(" + encoding + ")")); Class cls = null; Class[] ctorParams = {MainCodec.class}; //TERFactory.getInstance().logDebug("getCodec: Search internal codec for " + classType + '/' + encoding + '/' + typeName); - System.out.println("getCodec: Search internal codec for " + classType + '/' + encoding + '/' + typeName); +// System.out.println("getCodec: Search internal codec for " + classType + '/' + encoding + '/' + typeName); cls = codecs.get(classType + '/' + encoding + '/' + typeName); if(cls == null) { cls = codecs.get(classType + '/' + encoding + '/'); @@ -108,7 +108,7 @@ if(cls != null) { //TERFactory.getInstance().logDebug(" ==> " + cls.getName()); - System.out.println(" ==> " + cls.getName()); + //System.out.println(" ==> " + cls.getName()); try { Constructor ctor = cls.getConstructor(ctorParams); return ctor.newInstance(mainCodec); Index: codec/org/etsi/ttcn/codec/MainCodec.java =================================================================== --- codec/org/etsi/ttcn/codec/MainCodec.java (revision 2573) +++ codec/org/etsi/ttcn/codec/MainCodec.java (working copy) @@ -67,6 +67,8 @@ @Override public CodecBuffer encode(Value value) { + //TERFactory.getInstance().logDebug(">>> MainCodec.encode: " + value); + //System.out.println(">>> MainCodec.encode: " + value); CodecFactory cf = CodecFactory.getInstance(); TciCDProvided extCodec = cf.getExternalCodec(value.getValueEncoding()); Index: tool/org/etsi/its/tool/elvior/res/ta.properties =================================================================== --- tool/org/etsi/its/tool/elvior/res/ta.properties (revision 2573) +++ tool/org/etsi/its/tool/elvior/res/ta.properties (working copy) @@ -1,12 +1,12 @@ # Debug level - Authorized values: OFF, ALL, INFO, SEVERE DEBUG_ENABLED=OFF # Define the port/layer configuration for CAM -#camPort=BTP/GN/ETH -camPort=BTP/GN/UdpIpCSG +camPort=BTP/GN/ETH +#camPort=BTP/GN/UdpIpCSG #camPort=BTP/GN/CSG # Define the port/layer configuration for DENM -#denmPort=BTP/GN/ETH -denmPort=BTP/GN/UdpIpCSG +denmPort=BTP/GN/ETH +#denmPort=BTP/GN/UdpIpCSG #denmPort=BTP/GN/CSG # Define the port/layer configuration for MAPEM-SPATEM mapemSpatemPort=BTP/GN/ETH @@ -32,7 +32,7 @@ #fsapPort=FSAP/UdpIp #fsapPort=FSAP/UdpIp -# Commsignia RSU/OBU Simulator +# Commsignia RSU and OBU Simulator #UpperTesterSettings=10.200.1.101:12345 # Commsignia Wireless OBU UpperTesterSettings=80.98.62.165:18502 @@ -60,9 +60,10 @@ #LocalEthernetMAC=0022191B7FDB # G5 bridge connected on USB3/Ethernet #LocalEthernetMAC=00E08F008855 -# Post-mortem ATS execution mode +# Post-mortem ATS execution mode (G5 raw Ethernet only) OfflineMode=false -PcapFile=pcap/vendor/Livorno 20160914-2 DENM Full packet.pcap +#PcapFile=pcap/vendor/Livorno 20160914-2 DENM Full packet.pcap +PcapFile=F:/FSCOM/ETSI/ITS/STF517_ITS_Valid_Conform_Frmwk.2016/ITS-CMS5 PreQ/Savari/TC_SEC_ITSS_SND_MSG_01_01_BV.pcap # Start at time in seconds since 1970-01-01, e.g. 1421661427.233361 OffsetTime=0 # Define the Ethernet type value used by the IUT @@ -92,15 +93,15 @@ # Interval between each beacon sent by TS (ms) TsBeaconInterval=1000 # Latitude of Test System -#Commsignia -TsLatitude=514744250 +#Commsignia TsLatitude=514744250 #Yogoko TsLatitude=481210840 -#Livorno TsLatitude=43551050 +#Livorno +TsLatitude=43551050 # Longitude of Test System -#Commsignia -TsLongitude=56240550 +#Commsignia TsLongitude=56240550 # Yogoko TsLongitude=-16287930 -#Livorno TsLongitude=10298730 +#Livorno +TsLongitude=10298730 # Secured mode status UtSecuredMode=false # Secured configuration identifier