Commit 3c7286f4 authored by garciay's avatar garciay
Browse files

Start UpperTester changes

parent dcffd4b8
......@@ -35,4 +35,7 @@ module LibItsGeoNetworking_EncdecDeclarations {
with {extension "prototype(sliding) decode(LibItsSecurity)"}
*/
external function fx_enc_UtGnInitialize (UtGnInitialize p) return bitstring
with {extension "prototype(convert) encode(UpperTester)"}
} // End of module LibItsGeoNetworking_EncdecDeclarations
......@@ -46,7 +46,7 @@ module LibItsGeoNetworking_Functions {
* @desc Requests to bring the IUT in an initial state
* @param p_init The initialisation to trigger.
*/
function f_utInitializeIut(template (value) UtInitialize p_init) runs on ItsBaseGeoNetworking {
function f_utInitializeIut(template (value) UtGnInitialize p_init) runs on ItsBaseGeoNetworking {
//deactivate gnPort default alts
vc_gnDefaultActive := false;
......@@ -54,7 +54,7 @@ module LibItsGeoNetworking_Functions {
utPort.send(p_init);
tc_wait.start;
alt {
[] utPort.receive(UtInitializeResult:true) {
[] utPort.receive(UtGnResults: { utGnInitializeResult := true }) {
tc_wait.stop;
log("*** f_utInitializeIut: INFO: IUT initialized ***");
}
......@@ -2885,4 +2885,4 @@ module LibItsGeoNetworking_Functions {
}
} // end LibItsGeoNetworking_Functions
\ No newline at end of file
} // end LibItsGeoNetworking_Functions
......@@ -97,7 +97,7 @@ module LibItsGeoNetworking_Templates {
/**
* @desc Initializes the GN IUT.
*/
template (value) UtInitialize m_gnInitialize := {
template (value) UtGnInitialize m_gnInitialize := {
hashedId8 := '0000000000000000'O
}
......@@ -2283,4 +2283,4 @@ module LibItsGeoNetworking_Templates {
} // end geoMiscTemplates
} // end ItsGeoNetworking_Templates
\ No newline at end of file
} // end ItsGeoNetworking_Templates
......@@ -50,11 +50,11 @@ module LibItsGeoNetworking_TestSystem {
*/
type port UpperTesterPort message {
out
UtInitialize, UtChangePosition, UtAutoInteropTrigger, UtGnTrigger;
UtGnInitialize, UtChangePosition, UtAutoInteropTrigger, UtGnTrigger;
in
//FIXME RGY As discussed, boolean results are replaced by a top-level union of results
// UtInitializeResult, UtChangePositionResult, UtGnTriggerResult, UtGnEventInd;
UtCommonResults, UtGnTriggerResult, UtGnEventInd;
UtGnResults, /*UtCommonResults,*/ UtGnTriggerResult, UtGnEventInd;
} // end UpperTesterPort
} // end portDefinitions
......
......@@ -929,16 +929,41 @@ module LibItsGeoNetworking_TypesAndValues {
group utPrimitives {
/**
* @desc Upper Tester message to initialize IUT
* @member hashedId8 In case of secured mode set, hashedId8 indicate which certificate the IUT shall use
*/
type record UtGnInitialize {
Oct8 hashedId8
} with {
variant "FIELDORDER(msb)"
}
/**
* @desc Upper Tester results message of the GeoNetworking
* @member utGnInitialize -
* @member utGnTriggerResult -
* @member utAutoInteropTriggerResult -
*/
type union UtGnResults {
boolean utGnInitializeResult,
boolean utGnTriggerResult,
boolean utAutoInteropTriggerResult
} with {
variant ""
} // End of type UtGnResults
/**
* @desc AutoInterop UpperTester trigger
* @member utRadioOnOff Set to true to power on the radio (on-link mode), false to power off the radio (off-link).
*/
type union UtAutoInteropTrigger {
boolean utRadioOnOff
} with {
variant ""
} // End of type UtAutoInteropTrigger
type boolean UtAutoInteropTriggerResult;
/**
* @desc UT primitives for GeoNetworking
* @member geoUnicast -
......@@ -955,6 +980,8 @@ module LibItsGeoNetworking_TypesAndValues {
GenerateGeoAnycastMessage geoAnycast,
GenerateSHBMessage shb,
GenerateTSBMessage tsb
} with {
variant ""
}
type boolean UtGnTriggerResult;
......@@ -971,8 +998,8 @@ module LibItsGeoNetworking_TypesAndValues {
UInt16 lifetime,
TrafficClass trafficClass,
GnRawPayload payload
} with {
encode (payload) "UpperTester"
} with {
variant "FIELDORDER(msb)"
}
/**
......@@ -990,8 +1017,8 @@ module LibItsGeoNetworking_TypesAndValues {
UInt24 reserved,
Area area,
GnRawPayload payload
} with {
encode (payload) "UpperTester"
} with {
variant "FIELDORDER(msb)"
}
/**
......@@ -1008,7 +1035,7 @@ module LibItsGeoNetworking_TypesAndValues {
TrafficClass trafficClass,
GnRawPayload payload
} with {
encode (payload) "UpperTester"
variant "FIELDORDER(msb)"
}
/**
......@@ -1024,7 +1051,7 @@ module LibItsGeoNetworking_TypesAndValues {
TrafficClass trafficClass,
GnRawPayload payload
} with {
encode (payload) "UpperTester"
variant "FIELDORDER(msb)"
}
/**
......@@ -1033,6 +1060,8 @@ module LibItsGeoNetworking_TypesAndValues {
type record UtGnEventInd {
// GeoNetworkingPdu gnPdu
GnRawPayload rawPayload
} with {
variant "FIELDORDER(msb)"
}
/**
......@@ -1042,9 +1071,8 @@ module LibItsGeoNetworking_TypesAndValues {
} // end utPrimitives
with {
//FIXME RGY temporarily changed to RAW, until encoding functions are changed to UpperTester
// encode "UpperTester"
encode "RAW"; variant ""
encode "UpperTester";
variant ""
}
group acPrimitives {
......@@ -1067,6 +1095,8 @@ module LibItsGeoNetworking_TypesAndValues {
AcStartBeaconingMultipleNeighbour startBeaconingMultipleNeighbour,
AcStopBeaconingMultipleNeighbour stopBeaconingMultipleNeighbour,
AcGetLongPosVector getLongPosVector
} with {
variant ""
}
/**
......@@ -1078,8 +1108,9 @@ module LibItsGeoNetworking_TypesAndValues {
AcGnResponseFailure failure
}
with {
variant ""
encode(getLongPosVector) "LibItsGeoNetworking"
};
}
type record AcGnResponseFailure {
boolean failure
......@@ -1094,7 +1125,7 @@ module LibItsGeoNetworking_TypesAndValues {
}
with {
encode(beaconPacket) "LibItsGeoNetworking"
};
}
/**
* @desc Primitive for TA to stop sending beacons for the test component
......@@ -1151,7 +1182,8 @@ module LibItsGeoNetworking_TypesAndValues {
} // end acPrimitives
with {
encode "AdapterControl"
variant ""
encode "AdapterControl"
}
}
with {
......
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