Commit cd7aba32 authored by Yann Garcia's avatar Yann Garcia
Browse files

STF545: reorganise ports & tests

parent 2055629d

ttcn/Http/LibItsHttp_BinaryMessageBodyTypes.ttcn

+3 −2
Original line number Diff line number Diff line
@@ -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

+21 −14
Original line number Diff line number Diff line
@@ -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

+15 −10
Original line number Diff line number Diff line
@@ -15,6 +15,11 @@ 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;
@@ -22,12 +27,12 @@ module LibItsHttp_TestSystem { 
    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 {

  type component HttpTestAdapter { // FIXME To be rename into HttpTestSystem

    port HttpPort httpPort;

  } // End of component TestAdapter

ttcn/Pki/LibItsPki_TestSystem.ttcn

+45 −27
Original line number Diff line number Diff line
@@ -11,8 +11,14 @@ 
 */

module LibItsPki_TestSystem {

  

  // 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;
@@ -22,19 +28,31 @@ module LibItsPki_TestSystem { 
  import from EtsiTs102941MessagesItss language "ASN.1:1997" all;

  import from EtsiTs103097Module language "ASN.1:1997" all;

  

    // LibCam

    import from LibItsCam_TestSystem all;

  // LibItsSecurity

  import from LibItsSecurity_TestSystem all;

  

  // LibItsGeoNetworking

  import from LibItsGeoNetworking_TestSystem all;

  

  // LibItsHttp

  import from LibItsHttp_TestSystem all;

  

    type component ItsPkiSystem extends ItsCamSystem {

  type component ItsPkiSystem {

    port HttpPort httpPort;

  } // End of component ItsPkiSystem

  

    type component ItsPki extends ItsCam {

        port HttpPort httpPort;

  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