Commit a5fda293 authored by YannGarcia's avatar YannGarcia
Browse files

Start implementing MEC030

parent d008be9d

ccsrc/Protocols/Json/json_codec.cc

+15 −0
Original line number Original line Diff line number Diff line
@@ -409,6 +409,21 @@ int json_codec::decode (const OCTETSTRING& p_data, LibItsHttp__JsonMessageBodyTy 
    TTCN_Buffer decoding_buffer_(OCTETSTRING(str.length(), (const unsigned char*)str.c_str()));

    TTCN_Buffer decoding_buffer_(OCTETSTRING(str.length(), (const unsigned char*)str.c_str()));

    mts_session_info.decode(TrafficManagementAPI__TypesAndValues::MtsSessionInfo_descr_, decoding_buffer_, TTCN_EncDec::CT_JSON);

    mts_session_info.decode(TrafficManagementAPI__TypesAndValues::MtsSessionInfo_descr_, decoding_buffer_, TTCN_EncDec::CT_JSON);

    msg.mtsSessionInfo() = mts_session_info;

    msg.mtsSessionInfo() = mts_session_info;

  } else if ((it->second.find("\"uuUnicastProvisioningInfo\"") != std::string::npos) || (it->second.find("\"proInfoUuUnicast\"") != std::string::npos)) {

    V2XInformationServiceAPI__TypesAndValues::UuUnicastProvisioningInfo uu_unicast_provisioning_info;

    TTCN_Buffer decoding_buffer_(OCTETSTRING(str.length(), (const unsigned char*)str.c_str()));

    uu_unicast_provisioning_info.decode(V2XInformationServiceAPI__TypesAndValues::UuUnicastProvisioningInfo_descr_, decoding_buffer_, TTCN_EncDec::CT_JSON);

    msg.uuUnicastProvisioningInfo() = uu_unicast_provisioning_info;

  } else if ((it->second.find("\"uuMbmsProvisioningInfo\"") != std::string::npos) || (it->second.find("\"proInfoUuMbms\"") != std::string::npos)) {

    V2XInformationServiceAPI__TypesAndValues::UuMbmsProvisioningInfo uu_mbms_provisioning_info;

    TTCN_Buffer decoding_buffer_(OCTETSTRING(str.length(), (const unsigned char*)str.c_str()));

    uu_mbms_provisioning_info.decode(V2XInformationServiceAPI__TypesAndValues::UuMbmsProvisioningInfo_descr_, decoding_buffer_, TTCN_EncDec::CT_JSON);

    msg.uuMbmsProvisioningInfo() = uu_mbms_provisioning_info;

  } else if ((it->second.find("\"pc5ProvisioningInfo\"") != std::string::npos) || (it->second.find("\"proInfoPc5\"") != std::string::npos)) {

    V2XInformationServiceAPI__TypesAndValues::Pc5ProvisioningInfo pc5_provisioning_info;

    TTCN_Buffer decoding_buffer_(OCTETSTRING(str.length(), (const unsigned char*)str.c_str()));

    pc5_provisioning_info.decode(V2XInformationServiceAPI__TypesAndValues::Pc5ProvisioningInfo_descr_, decoding_buffer_, TTCN_EncDec::CT_JSON);

    msg.pc5ProvisioningInfo() = pc5_provisioning_info;

  } else if (it->second.find("\"detail\"") != std::string::npos) {

  } else if (it->second.find("\"detail\"") != std::string::npos) {

    LibMec__TypesAndValues::ProblemDetails problem_details;

    LibMec__TypesAndValues::ProblemDetails problem_details;

    problem_details.decode(LibMec__TypesAndValues::ProblemDetails_descr_, decoding_buffer, TTCN_EncDec::CT_JSON);

    problem_details.decode(LibMec__TypesAndValues::ProblemDetails_descr_, decoding_buffer, TTCN_EncDec::CT_JSON);

etc/AtsMec/AtsMec_Mockoon.cf_

+27 −3
Original line number Original line Diff line number Diff line
@@ -84,7 +84,7 @@ LogEventTypes:= Yes 




[TESTPORT_PARAMETERS]

[TESTPORT_PARAMETERS]

# In this section you can specify parameters that are passed to Test Ports.

# In this section you can specify parameters that are passed to Test Ports.

system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=192.168.1.39,port=30015,use_ssl=0)"

system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=192.168.1.39,port=30030,use_ssl=0)"

#system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=try-mec.etsi.org,port=443,use_ssl=1)"

#system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=try-mec.etsi.org,port=443,use_ssl=1)"

system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server_mode=1,local_port=8081,use_ssl=0)"

system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server_mode=1,local_port=8081,use_ssl=0)"
@@ -249,7 +249,7 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server 
# Check that the IUT responds with an error when a request for an unknown URI is sent by a MEC Application

# Check that the IUT responds with an error when a request for an unknown URI is sent by a MEC Application

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_004_NF

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_004_NF

# Check that the IUT updates the requested bandwidth requirements when commanded by a MEC Application

# Check that the IUT updates the requested bandwidth requirements when commanded by a MEC Application

AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_005_OK

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_005_OK

# Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application

# Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_005_BR

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_005_BR

# Check that the IUT responds with an error when a request for an unknown URI is sent by a MEC Application

# Check that the IUT responds with an error when a request for an unknown URI is sent by a MEC Application
@@ -284,7 +284,31 @@ AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_005_OK 
# ETSI GS MEC 028

# ETSI GS MEC 028





# ETSI GS MEC 030

# ETSI GS MEC 030

#AtsMec_V2XInformationAPI_TestCases.TC_MEC_MEC030_SRV_V2X_001_OK_01

# Check that the IUT responds with a configured provisioning information over Uu unicast when queried by a MEC Application

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_001_OK_01

# Check that the IUT responds with a configured provisioning information over Uu unicast when queried by a MEC Application

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_001_OK_02

# Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_001_BR

# Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_001_NF

# Check that the IUT responds with a configured provisioning information over Uu MBMS when queried by a MEC Application

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_002_OK_01

# Check that the IUT responds with a configured provisioning information over Uu MBMS when queried by a MEC Application

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_002_OK_02

# Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_002_BR

# Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_002_NF

# Check that the IUT responds with a configured provisioning information over PC5 when queried by a MEC Application

AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_003_OK_01

# Check that the IUT responds with a configured provisioning information over PC5 when queried by a MEC Application

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_003_OK_02

# Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_003_BR

# Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_003_NF











[GROUPS]

[GROUPS]

ttcn/AtsMec/AtsMec_V2XInformationServiceAPI_TestCases.ttcn

+631 −0

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/LibMec/V2XInformationServiceAPI/ttcn/V2XInformationServiceAPI_Pixits.ttcn

+5 −1
Original line number Original line Diff line number Diff line
@@ -3,6 +3,10 @@ module V2XInformationServiceAPI_Pixits { 
  // LibCommon

  // LibCommon

  import from LibCommon_BasicTypesAndValues all;

  import from LibCommon_BasicTypesAndValues all;





  modulepar charstring PX_V2X_ECGI := "0";

  modulepar charstring PX_V2X_ECGI := "ecgi,135792468";



  modulepar charstring PX_V2X_UNKNOWN_ECGI := "ecgi,1357924689";



  modulepar charstring PX_V2X_LATITUDE := "latitude,000.000,001.000,longitude,000.000,001.000";





} // End of module V2XInformationServiceAPI_Pixits 
} // End of module V2XInformationServiceAPI_Pixits

ttcn/LibMec/V2XInformationServiceAPI/ttcn/V2XInformationServiceAPI_Templates.ttcn

+32 −0
Original line number Original line Diff line number Diff line
@@ -36,4 +36,36 @@ module V2XInformationServiceAPI_Templates { 
    timeStamp        := p_timeStamp

    timeStamp        := p_timeStamp

  } // End of template mw_uu_unicast_provisioning_info

  } // End of template mw_uu_unicast_provisioning_info





  template (omit) UuMbmsProvisioningInfo m_uu_mbms_provisioning_info(

                                                                            in template (value) ProInfoUuMbmsList p_proInfoUuMbms,

                                                                            in template (omit) TimeStamp p_timeStamp := omit

                                                                            ) := {

    proInfoUuMbms := p_proInfoUuMbms,

    timeStamp     := p_timeStamp

  } // End of template m_uu_mbms_provisioning_info



  template (present) UuMbmsProvisioningInfo mw_uu_mbms_provisioning_info(

                                                                               template (present) ProInfoUuMbmsList p_proInfoUuMbms := ?,

                                                                               template TimeStamp p_timeStamp := *

                                                                               ) := {

    proInfoUuMbms := p_proInfoUuMbms,

    timeStamp     := p_timeStamp

  } // End of template mw_uu_mbms_provisioning_info



  template (omit) Pc5ProvisioningInfo m_pc5_provisioning_info(

                                                              in template (value) Pc5ProvisioningInfoProInfoPc5List p_proInfoPc5,

                                                              in template (omit) TimeStamp p_timeStamp := omit

                                                              ) := {

    proInfoPc5 := p_proInfoPc5,

    timeStamp  := p_timeStamp

  } // End of template m_pc5_provisioning_info



  template (present) Pc5ProvisioningInfo mw_pc5_provisioning_info(

                                                                  template (present) Pc5ProvisioningInfoProInfoPc5List p_proInfoPc5 := ?,

                                                                  template TimeStamp p_timeStamp := *

                                                                  ) := {

    proInfoPc5 := p_proInfoPc5,

    timeStamp  := p_timeStamp

  } // End of template mw_pc5_provisioning_info



} // End of module V2XInformationServiceAPI_Templates
 
} // End of module V2XInformationServiceAPI_Templates