Commit b8be4ba7 authored by garciay's avatar garciay
Browse files

Merge Dirk's changes

Modify @author clause
parent aef9fc3a
......@@ -90,7 +90,7 @@
/**
* @desc Setups default configuration
*/
function f_cfUp() runs on ItsBtp {
function f_cfUp() runs on ItsBtp system ItsBtpSystem {
map(self:utPort, system:utPort);
map(self:btpPort, system:btpPort);
......@@ -101,7 +101,7 @@
/**
* @desc Deletes default configuration
*/
function f_cfDown() runs on ItsBtp {
function f_cfDown() runs on ItsBtp system ItsBtpSystem {
unmap(self:utPort, system:utPort);
unmap(self:btpPort, system:btpPort);
......
/**
* @author ETSI / STF405 / STF449
* @author ETSI / STF405 / STF449 / STF484 / STF517
* @version $URL$
* $Id$
* @desc Module containing common functions for ITS CAM
......@@ -12,7 +12,7 @@ module LibItsCam_Functions {
import from LibCommon_VerdictControl all;
import from LibCommon_Sync all;
// Libits
// LibIts
import from ITS_Container language "ASN.1:1997" all;
import from CAM_PDU_Descriptions language "ASN.1:1997" all;
import from DENM_PDU_Descriptions language "ASN.1:1997" all;
......@@ -288,7 +288,7 @@ module LibItsCam_Functions {
*/
function f_cfUp(
in charstring p_certificateId := PX_CERT_FOR_TA
) runs on ItsCam {
) runs on ItsCam system ItsCamSystem {
map(self:utPort, system:utPort);
map(self:acPort, system:acPort);
......@@ -303,7 +303,7 @@ module LibItsCam_Functions {
/**
* @desc Deletes default configuration
*/
function f_cfDown() runs on ItsCam {
function f_cfDown() runs on ItsCam system ItsCamSystem {
// Initialise secured mode
f_uninitialiseSecuredMode();
......
/**
* @author ETSI / STF405 / STF449
* @author ETSI / STF405 / STF449 / STF484 / STF517
* @version $URL$
* $Id$
* @desc CAM PICS
......
/**
* @author ETSI / STF517
* @author ETSI / STF405 / STF449 / STF484 / STF517
* @version $URL$
* $Id$
* @desc Module containing Pixits for CAM
......
/**
* @author ETSI / STF405 / STF449
* @author ETSI / STF405 / STF449 / STF484 / STF517
* @version $URL$
* $Id$
* @desc Module containing base template definitions for CAM
......
/**
* @author ETSI / STF405 / STF449
* @author ETSI / STF405 / STF449 / STF484 / STF517
* @version $URL$
* $Id$
* @desc Test System module for ITS CAM
......
/**
* @author ETSI / STF405 / STF449
* @author ETSI / STF405 / STF449 / STF484 / STF517
* @version $URL$
* $Id$
* @desc Module containing types and values for CAM Protocol
......
/**
* @author ETSI / STF405 / STF449
* @author ETSI / STF405 / STF449 / STF484 / STF517
* @version $URL$
* $Id$
* @desc Module containing common functions for ITS
......
/**
* @author ETSI / STF449
* @author ETSI / STF405 / STF449 / STF484 / STF517
* @version $URL$
* $Id$
* @desc Common PIXITS
......
/**
* @author ETSI / STF405 / STF449
* @author ETSI / STF405 / STF449 / STF484 / STF517
* @version $URL$
* $Id$
* @desc Module containing base template definitions for DENM
......
/**
* @author ETSI / STF405
* @version $URL$
* @author ETSI / STF405 / STF449 / STF484 / STF517
* @version $URL$
* $Id$
* @desc Test System module for ITS
*
......
/**
* @author ETSI / STF405 / STF449
* @author ETSI / STF405 / STF449 / STF484 / STF517
* @version $URL$
* $Id$
* @desc Module containing common types and values for ITS Protocols
......
/**
* @author ETSI / STF405
* @author ETSI / STF405 / STF449 / STF484 / STF517
* @version $URL$
* $Id$
* @desc Module containing types and values for External protocols
......
/**
* @author ETSI / STF449
* @version $URL$
* @author ETSI / STF449 / STF484 / STF517
* @version $URL$
* $Id$
* @desc Module containing functions for DENM
* @desc Module containing functions for DENM
*
*/
module LibItsDenm_Functions {
......
/**
* @author ETSI / STF405
* @author ETSI / STF449 / STF484 / STF517
* @version $URL$
* $Id$
* @desc DENM PICS
......
/**
* @author ETSI / STF517
* @author ETSI / STF449 / STF484 / STF517
* @version $URL$
* $Id$
* @desc Module containing Pixits for DENM
......
/**
* @author ETSI / STF449
* @version $URL$
* @author ETSI / STF449 / STF484 / STF517
* @version $URL$
* $Id$
* @desc Module containing base template definitions for DENM
* @desc Module containing base template definitions for DENM
*
*/
module LibItsDenm_Templates {
......
/**
* @author ETSI / STF449
* @author ETSI / STF449 / STF484 / STF517
* @version $URL$
* $Id$
* @desc Test System module for ITS DENM
......
/**
* @author ETSI / STF449
* @author ETSI / STF449 / STF484 / STF517
* @version $URL$
* $Id$
* @desc Module containing type and value definitions for DENM
......@@ -70,7 +70,7 @@ module LibItsDenm_TypesAndValues {
TransmissionInterval repetitionInterval optional,
AlacarteContainer alacarte optional
}
/**
* @desc Upper Tester result message of request of triggering of an event at IUT
*/
......@@ -99,7 +99,7 @@ module LibItsDenm_TypesAndValues {
* @desc Upper Tester result message of an update request of an event on DENM IUT
*/
type record UtDenmUpdateResult {
boolean result,
boolean result,
ActionID actionId
}
......@@ -121,7 +121,7 @@ module LibItsDenm_TypesAndValues {
type record UtDenmEventInd {
DENM denMsg
} with {
encode (denMsg) "LibItsDenm_asn1"
encode (denMsg) "LibItsDenm_asn1"
}
/**
......
/**
* @author ETSI / STF405 / STF449
* @author ETSI / STF405 / STF449 / STF484 / STF517
* @version $URL$
* $Id$
* @desc Module containing functions for GeoNetworking
......@@ -150,7 +150,7 @@ module LibItsGeoNetworking_Functions {
* - Area2 which only includes NodeB
* NodeB being close to the area center
*/
function f_cf01Up(Scenario p_scenario := e_staticPosition) runs on ItsGeoNetworking {
function f_cf01Up(Scenario p_scenario := e_staticPosition) runs on ItsGeoNetworking system ItsGeoNetworkingSystem {
// Variables
var PositionTable v_positionTable := {};
......@@ -178,7 +178,7 @@ module LibItsGeoNetworking_Functions {
} // end f_cf01Up
function f_cf01Down() runs on ItsGeoNetworking {
function f_cf01Down() runs on ItsGeoNetworking system ItsGeoNetworkingSystem {
f_uninitialiseSecuredMode();
......@@ -203,7 +203,7 @@ module LibItsGeoNetworking_Functions {
*
* @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
*/
function f_cf02Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc {
function f_cf02Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Variables
var PositionTable v_positionTable := {};
......@@ -251,10 +251,14 @@ module LibItsGeoNetworking_Functions {
// Initialize components
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
if (isvalue(vc_componentTable[i].gnComponent)) {
vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
}
}
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
vc_componentTable[i].gnComponent.done;
if (isvalue(vc_componentTable[i].gnComponent)) {
vc_componentTable[i].gnComponent.done;
}
}
} // end f_cf02Up
......@@ -262,7 +266,7 @@ module LibItsGeoNetworking_Functions {
/**
* @desc Deletes configuration cf02
*/
function f_cf02Down() runs on ItsMtc mtc ItsMtc {
function f_cf02Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Local variables
var integer i;
......@@ -293,7 +297,7 @@ module LibItsGeoNetworking_Functions {
* NodeB being close to the area center
* @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
*/
function f_cf03Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc {
function f_cf03Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Variables
var PositionTable v_positionTable := {};
......@@ -341,10 +345,14 @@ module LibItsGeoNetworking_Functions {
// Initialize components
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
if (isvalue(vc_componentTable[i].gnComponent)) {
vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
}
}
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
vc_componentTable[i].gnComponent.done;
if (isvalue(vc_componentTable[i].gnComponent)) {
vc_componentTable[i].gnComponent.done;
}
}
} // end f_cf03Up
......@@ -352,7 +360,7 @@ module LibItsGeoNetworking_Functions {
/**
* @desc Deletes configuration cf03
*/
function f_cf03Down() runs on ItsMtc mtc ItsMtc {
function f_cf03Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Local variables
var integer i;
......@@ -385,7 +393,7 @@ module LibItsGeoNetworking_Functions {
* NodeB being close to the area center
* @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
*/
function f_cf04Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc {
function f_cf04Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Variables
var PositionTable v_positionTable := {};
......@@ -433,10 +441,14 @@ module LibItsGeoNetworking_Functions {
// Initialize components
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
if (isvalue(vc_componentTable[i].gnComponent)) {
vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
}
}
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
vc_componentTable[i].gnComponent.done;
if (isvalue(vc_componentTable[i].gnComponent)) {
vc_componentTable[i].gnComponent.done;
}
}
} // end f_cf04Up
......@@ -444,7 +456,7 @@ module LibItsGeoNetworking_Functions {
/**
* @desc Deletes configuration cf04
*/
function f_cf04Down() runs on ItsMtc mtc ItsMtc {
function f_cf04Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Local variables
var integer i;
......@@ -473,7 +485,7 @@ module LibItsGeoNetworking_Functions {
* - Area1 which only includes NodeB, NodeD and IUT
* @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
*/
function f_cf05Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc {
function f_cf05Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Variables
var PositionTable v_positionTable := {};
......@@ -521,17 +533,21 @@ module LibItsGeoNetworking_Functions {
// Initialize components
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
if (isvalue(vc_componentTable[i].gnComponent)) {
vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
}
}
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
vc_componentTable[i].gnComponent.done;
if (isvalue(vc_componentTable[i].gnComponent)) {
vc_componentTable[i].gnComponent.done;
}
}
}
/**
* @desc Deletes configuration cf05
*/
function f_cf05Down() runs on ItsMtc mtc ItsMtc {
function f_cf05Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Local variables
var integer i;
......@@ -561,7 +577,7 @@ module LibItsGeoNetworking_Functions {
* - IUT not in sectorial area of NodeB-NodeF
* @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
*/
function f_cf06Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc {
function f_cf06Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Variables
var PositionTable v_positionTable := {};
......@@ -609,17 +625,21 @@ module LibItsGeoNetworking_Functions {
// Initialize components
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
if (isvalue(vc_componentTable[i].gnComponent)) {
vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
}
}
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
vc_componentTable[i].gnComponent.done;
if (isvalue(vc_componentTable[i].gnComponent)) {
vc_componentTable[i].gnComponent.done;
}
}
}
/**
* @desc Deletes configuration cf06
*/
function f_cf06Down() runs on ItsMtc mtc ItsMtc {
function f_cf06Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Local variables
var integer i;
......@@ -648,7 +668,7 @@ module LibItsGeoNetworking_Functions {
* - Area1 which only includes NodeB, NodeD and IUT
* @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
*/
function f_cf07Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc {
function f_cf07Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Variables
var PositionTable v_positionTable := {};
......@@ -696,17 +716,21 @@ module LibItsGeoNetworking_Functions {
// Initialize components
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
if (isvalue(vc_componentTable[i].gnComponent)) {
vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
}
}
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
vc_componentTable[i].gnComponent.done;
if (isvalue(vc_componentTable[i].gnComponent)) {
vc_componentTable[i].gnComponent.done;
}
}
}
/**
* @desc Deletes configuration cf06
*/
function f_cf07Down() runs on ItsMtc mtc ItsMtc {
function f_cf07Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Local variables
var integer i;
......@@ -804,7 +828,12 @@ module LibItsGeoNetworking_Functions {
for (i:=0; i<lengthof(vc_componentTable); i:=i+1) {
if (vc_componentTable[i].componentName == p_componentName) {
v_return := vc_componentTable[i].gnComponent;
if (isvalue(vc_componentTable[i].gnComponent)) {
v_return := valueof(vc_componentTable[i].gnComponent);
}
else {
testcase.stop(__SCOPE__ & " can not handle omitted GN components");
}
}
}
......@@ -905,9 +934,7 @@ module LibItsGeoNetworking_Functions {
}
}
if (isbound(v_return) and (v_return.timestamp_ == 0)) {
v_return.timestamp_ := f_computeGnTimestamp();
}
/*Spirent removed*/
return v_return;
}
/**
......@@ -2747,7 +2774,8 @@ module LibItsGeoNetworking_Functions {
f_HashedId3FromHashedId8(
valueof(p_digest)
))
}
},
""
);
// Build secured Gn packet
......
Supports Markdown
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