Skip to content

GitLab

Commit 049adf80 authored by garciay's avatar garciay
Browse files

Spirent upgrade of plugin configuration files 

Add Commsignia libraries
parent 4e1103ee
Show whitespace changes
Inline Side-by-side
Showing with 250 additions and 256 deletions
javasrc/adapter/org/etsi/its/adapter/ComponentMgr.java
View file @ 049adf80
......@@ -82,11 +82,11 @@ public class ComponentMgr{
public void addPort(final String componentName, final TriPortId ttcnPort, final IPort port) {
// Sanity checks
if(componentName.isEmpty() || (ttcnPort == null) || (port == null)) {
TERFactory.getInstance().logError("Wrong parameters");
TERFactory.getInstance().logError("ComponentMgr.addPort: Wrong parameters");
return;
}
if(!mapCompNameToTriComp.containsKey(componentName)) {
TERFactory.getInstance().logError("Error: Trying to add port to unknown component");
TERFactory.getInstance().logError("ComponentMgr.addPort: Trying to add port to unknown component");
return;
}
if(!mapTriPortToTuple.containsKey(componentName)) {
......@@ -111,7 +111,7 @@ public class ComponentMgr{
// Sanity checks
if(componentName == null || componentName.isEmpty()) {
TERFactory.getInstance().logError("Invalid component");
TERFactory.getInstance().logError("ComponentMgr.getComponent: Invalid component");
return null;
}
......@@ -128,15 +128,15 @@ public class ComponentMgr{
// Sanity checks
if(componentName.isEmpty() || portName.isEmpty()) {
TERFactory.getInstance().logError("Wrong parameters");
TERFactory.getInstance().logError("ComponentMgr.getPortId: Wrong parameters");
return null;
}
if(!mapCompNameToTriComp.containsKey(componentName)) {
TERFactory.getInstance().logError("Unknown component");
TERFactory.getInstance().logError("ComponentMgr.getPortId: Unknown component");
return null;
}
if(!mapTriPortToTuple.containsKey(componentName)) {
TERFactory.getInstance().logError("No port list entry");
TERFactory.getInstance().logError("ComponentMgr.getPortId: No port list entry");
return null;
}
......@@ -161,15 +161,15 @@ public class ComponentMgr{
// Sanity checks
if(componentName.isEmpty() || portName.isEmpty()) {
TERFactory.getInstance().logError("Wrong parameters");
TERFactory.getInstance().logError("ComponentMgr.getPort: Wrong parameters");
return null;
}
if(!mapCompNameToTriComp.containsKey(componentName)) {
TERFactory.getInstance().logError("Unknown component");
TERFactory.getInstance().logError("ComponentMgr.getPort: Unknown component");
return null;
}
if(!mapTriPortToTuple.containsKey(componentName)) {
TERFactory.getInstance().logError("No port list entry");
TERFactory.getInstance().logError("ComponentMgr.getPort: No port list entry");
return null;
}
......@@ -205,15 +205,15 @@ public class ComponentMgr{
// Sanity checks
if(componentName.isEmpty() || portName.isEmpty()) {
TERFactory.getInstance().logError("Wrong parameters");
TERFactory.getInstance().logError("ComponentMgr.removePort: Wrong parameters");
return;
}
if(!mapCompNameToTriComp.containsKey(componentName)) {
TERFactory.getInstance().logError("Unknown component");
TERFactory.getInstance().logError("ComponentMgr.removePort: Unknown component");
return;
}
if(!mapTriPortToTuple.containsKey(componentName)) {
TERFactory.getInstance().logError("No port list entry");
TERFactory.getInstance().logError("ComponentMgr.removePort: No port list entry");
return;
}
......
javasrc/extfunc/org/etsi/its/extfunc/ItsExternalFunctionsProvider.java
View file @ 049adf80
......@@ -55,7 +55,7 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
/**
* Logger instance
*/
private final static Logger _logger = Logger.getLogger("org.etsi.its");
//private final static Logger _logger = Logger.getLogger("org.etsi.its");
/**
* Unique instance of TciCDWrapper class
......@@ -83,8 +83,7 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
* Default ctor
*/
public ItsExternalFunctionsProvider() {
_logger.entering("ItsExternalFunctionsProvider", "Constructor",
String.format("version:%s", Version));
//_logger.entering("ItsExternalFunctionsProvider", "Constructor", String.format("version:%s", Version));
_tcicdWrapper = TciCDWrapperFactory.getTciCDInstance();
......@@ -110,7 +109,7 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
@Override
public synchronized IntegerValue fx_getCurrentTime() {
IntegerValue now = null;
_logger.entering("ItsExternalFunctionsProvider", "fx_getCurrentTime");
//_logger.entering("ItsExternalFunctionsProvider", "fx_getCurrentTime");
if (gnssScenarioSupport) {
now = _tcicdWrapper.setInteger(GNSS.getGpsTime());
......@@ -130,7 +129,7 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
now = _tcicdWrapper.setInteger(0);
}
_logger.exiting("ItsExternalFunctionsProvider", "fx_getCurrentTime", String.format("%10d", _tcicdWrapper.getBigInteger(now)));
//_logger.exiting("ItsExternalFunctionsProvider", "fx_getCurrentTime", String.format("%10d", _tcicdWrapper.getBigInteger(now)));
}
return now;
} // End of method fx_getCurrentTime
......@@ -156,7 +155,7 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
public synchronized FloatValue fx_computeDistance(
final IntegerValue p_latitudeA, final IntegerValue p_longitudeA,
final IntegerValue p_latitudeB, final IntegerValue p_longitudeB) {
// _logger.entering("ItsExternalFunctionsProvider", "fx_computeDistance",
// //_logger.entering("ItsExternalFunctionsProvider", "fx_computeDistance",
// String.format("%d, %d, %d, %d",
// p_latitudeA.getInteger(),
// p_longitudeA.getInteger(),
......@@ -209,7 +208,7 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
final IntegerValue p_refLongitude, final FloatValue p_distance,
final IntegerValue p_orientation, IntegerValue p_latitude,
IntegerValue p_longitude) {
// _logger.entering(
// //_logger.entering(
// "ItsExternalFunctionsProvider",
// "fx_computePositionUsingDistance",
// String.format("%d, %d", p_distance.getInteger(),
......@@ -333,8 +332,7 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
final OctetstringValue p_destinationAddress,
final IntegerValue p_payloadLength,
final OctetstringValue p_payload, final IntegerValue p_nextHdr) {
_logger.entering("ItsExternalFunctionsProvider",
"fx_computeIPv6CheckSum");
//_logger.entering("ItsExternalFunctionsProvider", "fx_computeIPv6CheckSum");
// Build the pseudo header according RFC 2460 - Clause 8.1
ByteArrayOutputStream pseudoheader = new ByteArrayOutputStream();
......@@ -378,18 +376,14 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
--length;
}
sum = (~((sum & 0xFFFF) + (sum >> 16))) & 0xFFFF;
_logger.info(String
.format("ItsExternalFunctionsProvider.fx_computeIPv6CheckSum: finalSum=%d",
sum));
//_logger.info(String.format("ItsExternalFunctionsProvider.fx_computeIPv6CheckSum: finalSum=%d",sum));
// Set the return value
OctetstringValue checksum = _tcicdWrapper.getOctetstring();
checksum.setLength(2);
checksum.setOctet(0, (byte) ((byte) (sum >> 8) & 0xff));
checksum.setOctet(1, (byte) (sum & 0x00ff));
_logger.exiting("ItsExternalFunctionsProvider",
"fx_computeIPv6CheckSum", checksum); // FIXME Check which method
// to call for logging
//_logger.exiting("ItsExternalFunctionsProvider", "fx_computeIPv6CheckSum", checksum); // FIXME Check which method to call for logging
return checksum;
}
......@@ -421,7 +415,7 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
* @return The hash value
*/
public OctetstringValue fx_hashWithSha256(final OctetstringValue p_toBeHashedData) {
_logger.entering("ItsExternalFunctionsProvider", "fx_hashWithSha256");
//_logger.entering("ItsExternalFunctionsProvider", "fx_hashWithSha256");
byte[] toBeHashedData = new byte[p_toBeHashedData.getLength()];
for (int i = 0; i < toBeHashedData.length; i++) {
......@@ -444,7 +438,7 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
* @return The signature value
*/
public OctetstringValue fx_signWithEcdsaNistp256WithSha256(final OctetstringValue p_toBeSignedData, final OctetstringValue/*IntegerValue*/ p_privateKey) {
_logger.entering("ItsExternalFunctionsProvider", "fx_signWithEcdsaNistp256WithSha256");
//_logger.entering("ItsExternalFunctionsProvider", "fx_signWithEcdsaNistp256WithSha256");
byte[] toBeSignedData = new byte[p_toBeSignedData.getLength()];
for (int i = 0; i < toBeSignedData.length; i++) {
......@@ -481,7 +475,7 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
* @return true on success, false otherwise
*/
public BooleanValue fx_verifyWithEcdsaNistp256WithSha256(final OctetstringValue p_toBeVerifiedData, final OctetstringValue p_signature, final OctetstringValue p_ecdsaNistp256PublicKeyX, final OctetstringValue p_ecdsaNistp256PublicKeyY) {
_logger.entering("ItsExternalFunctionsProvider", "fx_verifyWithEcdsaNistp256WithSha256");
//_logger.entering("ItsExternalFunctionsProvider", "fx_verifyWithEcdsaNistp256WithSha256");
BooleanValue result = _tcicdWrapper.getBoolean();
result.setBoolean(false);
......@@ -513,7 +507,7 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
e.printStackTrace();
}
_logger.exiting("ItsExternalFunctionsProvider", "fx_verifyWithEcdsaNistp256WithSha256");
//_logger.exiting("ItsExternalFunctionsProvider", "fx_verifyWithEcdsaNistp256WithSha256");
return result;
}
......@@ -525,7 +519,7 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
* @return true on success, false otherwise
*/
public BooleanValue fx_generateKeyPair(OctetstringValue/*IntegerValue*/ p_privateKey, OctetstringValue p_publicKeyX, OctetstringValue p_publicKeyY) {
_logger.entering("ItsExternalFunctionsProvider", "fx_generateKeyPair");
//_logger.entering("ItsExternalFunctionsProvider", "fx_generateKeyPair");
BooleanValue result = _tcicdWrapper.getBoolean();
result.setBoolean(true);
......@@ -547,7 +541,7 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
p_publicKeyY.setOctet(i, ref[i]);
} // End 'for' statement
_logger.exiting("ItsExternalFunctionsProvider", "fx_generateKeyPair");
//_logger.exiting("ItsExternalFunctionsProvider", "fx_generateKeyPair");
return result;
}
......@@ -557,7 +551,7 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
* @return true on success, false otherwise
*/
public BooleanValue fx_isValidPolygonalRegion(final RecordOfValue p_region) {
_logger.entering("ItsExternalFunctionsProvider", "fx_isValidPolygonalRegion");
//_logger.entering("ItsExternalFunctionsProvider", "fx_isValidPolygonalRegion");
// Setup arguments
ArrayList<WGS84> polygonalArea = new ArrayList<WGS84>();
......@@ -574,13 +568,13 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
BooleanValue result = _tcicdWrapper.getBoolean();
result.setBoolean(Positioning.getInstance().isValidPolygonArea(polygonalArea));
_logger.exiting("ItsExternalFunctionsProvider", "fx_isValidPolygonalRegion");
//_logger.exiting("ItsExternalFunctionsProvider", "fx_isValidPolygonalRegion");
return result;
}
@Override
public BooleanValue fx_isPolygonalRegionInside(final RecordOfValue p_parent, final RecordOfValue p_region) {
_logger.entering("ItsExternalFunctionsProvider", "fx_isPolygonalRegionInside");
//_logger.entering("ItsExternalFunctionsProvider", "fx_isPolygonalRegionInside");
// Setup arguments
ArrayList<WGS84> parentArea = new ArrayList<WGS84>();
......@@ -606,13 +600,13 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
BooleanValue result = _tcicdWrapper.getBoolean();
result.setBoolean(Positioning.getInstance().isPolygonalRegionInside(parentArea, regionArea));
_logger.exiting("ItsExternalFunctionsProvider", "fx_isPolygonalRegionInside");
//_logger.exiting("ItsExternalFunctionsProvider", "fx_isPolygonalRegionInside");
return result;
}
@Override
public BooleanValue fx_isLocationInsideCircularRegion(final RecordValue p_region, final RecordValue p_location) {
_logger.entering("ItsExternalFunctionsProvider", "fx_isLocationInsideCircularRegion");
//_logger.entering("ItsExternalFunctionsProvider", "fx_isLocationInsideCircularRegion");
// Setup arguments
RecordValue rv = (RecordValue)p_region.getField("center"); // Center
......@@ -630,13 +624,13 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
BooleanValue result = _tcicdWrapper.getBoolean();
result.setBoolean(Positioning.getInstance().isLocationInsideCircularArea(location, center, radius));
_logger.exiting("ItsExternalFunctionsProvider", "fx_isLocationInsideCircularRegion");
//_logger.exiting("ItsExternalFunctionsProvider", "fx_isLocationInsideCircularRegion");
return result;
}
@Override
public BooleanValue fx_isLocationInsideRectangularRegion(final RecordOfValue p_region, final RecordValue p_location) {
_logger.entering("ItsExternalFunctionsProvider", "fx_isLocationInsideRectangularRegion");
//_logger.entering("ItsExternalFunctionsProvider", "fx_isLocationInsideRectangularRegion");
// Setup arguments
ArrayList< ArrayList<WGS84> > polygonalAreas = new ArrayList< ArrayList<WGS84> >();
......@@ -684,13 +678,13 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
BooleanValue result = _tcicdWrapper.getBoolean();
result.setBoolean(Positioning.getInstance().isLocationInsidePolygonalAreas(location, polygonalAreas));
_logger.exiting("ItsExternalFunctionsProvider", "fx_isLocationInsideRectangularRegion");
//_logger.exiting("ItsExternalFunctionsProvider", "fx_isLocationInsideRectangularRegion");
return result;
}
@Override
public BooleanValue fx_isLocationInsidePolygonalRegion(final RecordOfValue p_region, final RecordValue p_location) {
_logger.entering("ItsExternalFunctionsProvider", "fx_isLocationInsidePolygonalRegion");
//_logger.entering("ItsExternalFunctionsProvider", "fx_isLocationInsidePolygonalRegion");
// Setup arguments
ArrayList<WGS84> polygonalArea = new ArrayList<WGS84>();
......@@ -713,13 +707,13 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
BooleanValue result = _tcicdWrapper.getBoolean();
result.setBoolean(Positioning.getInstance().isLocationInsidePolygonalArea(location, polygonalArea));
_logger.exiting("ItsExternalFunctionsProvider", "fx_isLocationInsidePolygonalRegion");
//_logger.exiting("ItsExternalFunctionsProvider", "fx_isLocationInsidePolygonalRegion");
return result;
}
@Override
public BooleanValue fx_isLocationInsideIdentifiedRegion(final RecordValue p_region, final RecordValue p_location) {
_logger.entering("ItsExternalFunctionsProvider", "fx_isLocationInsideIdentifiedRegion");
//_logger.entering("ItsExternalFunctionsProvider", "fx_isLocationInsideIdentifiedRegion");
// Setup arguments
int regionDictionary = ((EnumeratedValue) p_region.getField("region_dictionary")).getInt();
......@@ -734,13 +728,13 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
BooleanValue result = _tcicdWrapper.getBoolean();
result.setBoolean(Positioning.getInstance().isLocationInsideIdentifiedRegion(regionDictionary, regionId, localRegion, location));
_logger.exiting("ItsExternalFunctionsProvider", "fx_isLocationInsideIdentifiedRegion");
//_logger.exiting("ItsExternalFunctionsProvider", "fx_isLocationInsideIdentifiedRegion");
return result;
}
@Override
public FloatValue fx_dms2dd(final IntegerValue p_degrees, final IntegerValue p_minutes, final FloatValue p_seconds, final OctetstringValue p_latlon) {
_logger.entering("ItsExternalFunctionsProvider", "fx_dms2dd");
//_logger.entering("ItsExternalFunctionsProvider", "fx_dms2dd");
// Call Geodesic function
FloatValue result = _tcicdWrapper.getFloat();
......@@ -752,7 +746,7 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid
);
result.setFloat((float) location.toDD());
_logger.exiting("ItsExternalFunctionsProvider", "fx_dms2dd");
//_logger.exiting("ItsExternalFunctionsProvider", "fx_dms2dd");
return result;
}
......
taconfig.xml
View file @ 049adf80
......@@ -17,17 +17,17 @@
</codec>
<codec encode="LibItsMapemSpatem_asn1">
<plugin id="org.etsi.its.codec.tool.testingtech.LibItsMapemSpatem_asn1">
<parameter id="class" value="org.etsi.its.codec.tool.testingtech.LibItsMapSpat_asn1.LibItsMapemSpatem_asn1PERCanonicalUnalignedCodecProvider"/>
<parameter id="class" value="org.etsi.its.codec.tool.testingtech.LibItsMapemSpatem_asn1.LibItsMapemSpatem_asn1PERCanonicalUnalignedCodecProvider"/>
</plugin>
</codec>
<codec encode="LibItsIvim_asn1">
<plugin id="org.etsi.its.codec.tool.testingtech.LibItsIvim_asn1">
<parameter id="class" value="org.etsi.its.codec.tool.testingtech.LibItsMapSpat_asn1.LibItsIvim_asn1PERCanonicalUnalignedCodecProvider"/>
<parameter id="class" value="org.etsi.its.codec.tool.testingtech.LibItsIvim_asn1.LibItsIvim_asn1PERCanonicalUnalignedCodecProvider"/>
</plugin>
</codec>
<codec encode="LibItsSremSsem_asn1">
<plugin id="org.etsi.its.codec.tool.testingtech.LibIteSremSsem_asn1">
<parameter id="class" value="org.etsi.its.codec.tool.testingtech.LibIteMapSpat_asn1.LibIteSremSsem_asn1PERCanonicalUnalignedCodecProvider"/>
<parameter id="class" value="org.etsi.its.codec.tool.testingtech.LibIteSremSsem_asn1.LibIteSremSsem_asn1PERCanonicalUnalignedCodecProvider"/>
</plugin>
</codec>
<codec encode="">
......@@ -42,7 +42,7 @@
</plugin>
</extfunc>
<port>
<plugin id="com.testingtech.ttworkbench">
<plugin id="com.testingtech.ttworkbench.sa">
<parameter id="class" value="org.etsi.its.tool.testingtech.PluginAdapter"/>
</plugin>
<parameter id="taParams">
......@@ -61,20 +61,20 @@
<parameter id="btpPort" value="GN/ETH"/>
<parameter id="geoNetworkingPort" value="ETH"/>
<parameter id="ipv6OverGeoNetworkingPort" value="Debug"/>
<parameter id="UpperTesterSettings" value="172.17.15.39:12345"/>
<parameter id="UpperTesterSettings" value="172.17.15.38:12345"/>
<parameter id="LocalEthernetMAC" value="00E08F008855"/>
<parameter id="IutEthernetTypeValue" value="0x8947"/>
<parameter id="TsBeaconInterval" value="1000"/>
<parameter id="TsLatitude" value="43616929"/>
<parameter id="TsLongitude" value="7052907"/>
<parameter id="LinkLayer_MTC" value="BABEBABE0000"/>
<parameter id="LinkLayer_NodeA" value="BABEBABE0001"/>
<parameter id="LinkLayer_NodeB" value="BABEBABE0002"/>
<parameter id="LinkLayer_NodeC" value="BABEBABE0003"/>
<parameter id="LinkLayer_NodeD" value="BABEBABE0004"/>
<parameter id="LinkLayer_NodeE" value="BABEBABE0005"/>
<parameter id="LinkLayer_NodeF" value="BABEBABE0006"/>
<parameter id="Gn6RemoteAdapterIp" value="10.7.6.80"/>
<parameter id="TsLatitude" value="43551050"/>
<parameter id="TsLongitude" value="10298730"/>
<parameter id="LinkLayer_MTC" value="8BADF00D0000"/>
<parameter id="LinkLayer_NodeA" value="8BADF00D0001"/>
<parameter id="LinkLayer_NodeB" value="8BADF00D0002"/>
<parameter id="LinkLayer_NodeC" value="8BADF00D0003"/>
<parameter id="LinkLayer_NodeD" value="8BADF00D0004"/>
<parameter id="LinkLayer_NodeE" value="8BADF00D0005"/>
<parameter id="LinkLayer_NodeF" value="8BADF00D0006"/>
<parameter id="Gn6RemoteAdapterIp" value="172.17.15.38"/>
<parameter id="Gn6RemoteAdapterPort" value="42000"/>
<parameter id="TsItsAidOther" value="38"/>
<parameter id="UtSecuredMode" value="false"/>
......@@ -82,7 +82,7 @@
<parameter id="TsSecuredConfiId">
<value>
<Values:charstring xmlns:Values="Values.xsd" type="charstring">
<Values:value>ts</Values:value>
<Values:value></Values:value>
</Values:charstring>
</value>
</parameter>
......
Markdown is supported
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