Skip to content
GitLab
Commit cd7aba32 authored by Yann Garcia's avatar Yann Garcia
Browse files

STF545: reorganise ports & tests

parent 2055629d
Hide whitespace changes
Inline Side-by-side
ttcn/Http/LibItsHttp_BinaryMessageBodyTypes.ttcn
View file @ cd7aba32
......@@ -25,8 +25,9 @@ module LibItsHttp_BinaryMessageBodyTypes {
type union BinaryBody {
// TODO Add here your custom variants
InnerEcRequest innerEcRequest,
InnerEcResponse innerEcResponse,
// InnerEcRequest innerEcRequest, Move to PkiPort
// InnerEcResponse innerEcResponse,
Ieee1609Dot2Data ieee1609dot2_data
octetstring raw
} with {
variant ""
......
ttcn/Http/LibItsHttp_BinaryTemplates.ttcn
View file @ cd7aba32
......@@ -35,22 +35,29 @@ module LibItsHttp_BinaryTemplates {
} // End of template mw_binary_body_raw
// TODO Add here your custom binary template
template (value) BinaryBody m_binary_body_innerEcRequest(
in template (value) InnerEcRequest p_innerEcRequest
template (value) BinaryBody m_binary_body_ieee1609dot2_data(
in template (value) Ieee1609Dot2Data p_ieee1609dot2_data
) := {
innerEcRequest := p_innerEcRequest
} // End of template m_binary_body_innerEcRequest
ieee1609dot2_data := p_ieee1609dot2_data
} // End of template m_binary_body_ieee1609dot2_data
template (present) BinaryBody mw_binary_body_innerEcRequest(
template (present) InnerEcRequest p_innerEcRequest := ?
template (present) BinaryBody mw_binary_body_ieee1609dot2_data(
template (present) Ieee1609Dot2Data p_ieee1609dot2_data := ?
) := {
innerEcRequest := p_innerEcRequest
} // End of template mw_binary_body_innerEcRequest
template (present) BinaryBody mw_binary_body_innerEcResponse(
template (present) InnerEcResponse p_innerEcResponse := ?
) := {
innerEcResponse := p_innerEcResponse
} // End of template mw_binary_body_innerEcResponse
ieee1609dot2_data := p_ieee1609dot2_data
} // End of template mw_binary_body_ieee1609dot2_data
// Move to Pki
// template (present) BinaryBody mw_binary_body_innerEcRequest(
// template (present) InnerEcRequest p_innerEcRequest := ?
// ) := {
// innerEcRequest := p_innerEcRequest
// } // End of template mw_binary_body_innerEcRequest
//
// template (present) BinaryBody mw_binary_body_innerEcResponse(
// template (present) InnerEcResponse p_innerEcResponse := ?
// ) := {
// innerEcResponse := p_innerEcResponse
// } // End of template mw_binary_body_innerEcResponse
//
} // End of module LibItsHttp_BinaryTemplates
ttcn/Http/LibItsHttp_TestSystem.ttcn
View file @ cd7aba32
/**
* @author ETSI / STF545
* @version $URL$
* $ID:$
* $ID:$
* @desc This module provides the test system used by ITS HTTP based protocols.
* @copyright ETSI Copyright Notification
* No part may be reproduced except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* All rights reserved.
* No part may be reproduced except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* All rights reserved.
* @see ETSI TS 103 478
*/
module LibItsHttp_TestSystem {
......@@ -15,20 +15,25 @@ module LibItsHttp_TestSystem {
import from LibCommon_Sync all;
import from LibCommon_Time all;
// LibItsCommon
import from LibItsCommon_TestSystem all;
import from LibItsCommon_TypesAndValues all;
import from LibItsExternal_TypesAndValues all;
// LibItsHttp
import from LibItsHttp_TypesAndValues all;
type port HttpPort message {
inout HttpMessage;
inout HttpMessage;
}
type component HttpComponent extends SelfSyncComp {
type component HttpComponent extends SelfSyncComp { // FIXME To be rename into HttpTest
port HttpPort httpPort;
timer tc_ac := PX_TAC;
} // End of component HttpComponent
type component HttpTestAdapter {
port HttpPort httpPort;
} // End of component TestAdapter
type component HttpTestAdapter { // FIXME To be rename into HttpTestSystem
port HttpPort httpPort;
} // End of component TestAdapter
} // End of module LibItsHttp_TestSystem
ttcn/Pki/LibItsPki_TestSystem.ttcn
View file @ cd7aba32
......@@ -10,31 +10,49 @@
*
*/
module LibItsPki_TestSystem {
// LibItsCommon
import from LibItsCommon_TestSystem all;
// LibIts
import from IEEE1609dot2BaseTypes language "ASN.1:1997" all;
import from IEEE1609dot2 language "ASN.1:1997" all;
import from EtsiTs102941BaseTypes language "ASN.1:1997" all;
import from EtsiTs102941TypesEnrolment language "ASN.1:1997" all;
import from EtsiTs102941MessagesItss language "ASN.1:1997" all;
import from EtsiTs103097Module language "ASN.1:1997" all;
// LibCam
import from LibItsCam_TestSystem all;
// LibItsHttp
import from LibItsHttp_TestSystem all;
type component ItsPkiSystem extends ItsCamSystem {
port HttpPort httpPort;
} // End of component ItsPkiSystem
type component ItsPki extends ItsCam {
port HttpPort httpPort;
} // End of component ItsPki
// LibCommon
import from LibCommon_Sync all;
import from LibCommon_Time all;
// LibItsCommon
import from LibItsCommon_TestSystem all;
import from LibItsCommon_TypesAndValues all;
import from LibItsExternal_TypesAndValues all;
// LibIts
import from IEEE1609dot2BaseTypes language "ASN.1:1997" all;
import from IEEE1609dot2 language "ASN.1:1997" all;
import from EtsiTs102941BaseTypes language "ASN.1:1997" all;
import from EtsiTs102941TypesEnrolment language "ASN.1:1997" all;
import from EtsiTs102941MessagesItss language "ASN.1:1997" all;
import from EtsiTs103097Module language "ASN.1:1997" all;
// LibItsSecurity
import from LibItsSecurity_TestSystem all;
// LibItsGeoNetworking
import from LibItsGeoNetworking_TestSystem all;
// LibItsHttp
import from LibItsHttp_TestSystem all;
type component ItsPkiSystem {
port HttpPort httpPort;
} // End of component ItsPkiSystem
type component ItsPkiSystemItss extends ItsPkiSystem {
port LibItsGeoNetworking_TestSystem.AdapterControlPort acPort;
port LibItsGeoNetworking_TestSystem.UpperTesterPort utPort;
port GeoNetworkingPort geoNetworkingPort;
} // End of component ItsPkiSystemItss
type component ItsPki extends ItsSecurityBaseComponent, ItsBaseMtc {
port HttpPort httpPort;
} // End of component ItsPki
type component ItsPkiItss extends ItsGeoNetworking {
port HttpPort httpPort;
} // End of component ItsPkiItss
} // End of module LibItsPki_TestSystem
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