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

Validation VIS ATS against MEC Sanbox

parent 207a72db

ccsrc/Protocols/Json/json_codec.cc

+13 −1
Original line number Diff line number Diff line
@@ -92,7 +92,14 @@ int json_codec::encode (const LibHttp__JsonMessageBodyTypes::JsonBody& msg, OCTE 
    const V2XInformationServiceAPI__TypesAndValues::ProvChgUuMbmsSubscription& prov_chg_uu_mbms_subscription = msg.provChgUuMbmsSubscription();

    prov_chg_uu_mbms_subscription.encode(V2XInformationServiceAPI__TypesAndValues::ProvChgUuMbmsSubscription_descr_, encoding_buffer, TTCN_EncDec::CT_JSON);

    data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data())/* + char2oct(CHARSTRING("}"))*/;



  } else if (msg.ischosen(LibHttp__JsonMessageBodyTypes::JsonBody::ALT_provChgPc5Subscription)) {

    const V2XInformationServiceAPI__TypesAndValues::ProvChgPc5Subscription& prov_chg_pc5_subscription = msg.provChgPc5Subscription();

    prov_chg_pc5_subscription.encode(V2XInformationServiceAPI__TypesAndValues::ProvChgPc5Subscription_descr_, encoding_buffer, TTCN_EncDec::CT_JSON);

    data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data())/* + char2oct(CHARSTRING("}"))*/;

  } else if (msg.ischosen(LibHttp__JsonMessageBodyTypes::JsonBody::ALT_v2xMsgSubscription)) {

    const V2XInformationServiceAPI__TypesAndValues::V2xMsgSubscription& v2x_msg_subscription = msg.v2xMsgSubscription();

    v2x_msg_subscription.encode(V2XInformationServiceAPI__TypesAndValues::V2xMsgSubscription_descr_, encoding_buffer, TTCN_EncDec::CT_JSON);

    data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data())/* + char2oct(CHARSTRING("}"))*/;





  } else if (msg.ischosen(LibHttp__JsonMessageBodyTypes::JsonBody::ALT_assocStaSubscription)) {
@@ -428,6 +435,11 @@ int json_codec::decode (const OCTETSTRING& p_data, LibHttp__JsonMessageBodyTypes 
    TTCN_Buffer decoding_buffer_(OCTETSTRING(str.length(), (const unsigned char*)str.c_str()));

    prov_chg_pc5_subscription.decode(V2XInformationServiceAPI__TypesAndValues::ProvChgPc5Subscription_descr_, decoding_buffer_, TTCN_EncDec::CT_JSON);

    msg.provChgPc5Subscription() = prov_chg_pc5_subscription;

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

    V2XInformationServiceAPI__TypesAndValues::V2xMsgSubscription v2x_msg_subscription;

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

    v2x_msg_subscription.decode(V2XInformationServiceAPI__TypesAndValues::V2xMsgSubscription_descr_, decoding_buffer_, TTCN_EncDec::CT_JSON);

    msg.v2xMsgSubscription() = v2x_msg_subscription;





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

etc/AtsMec_V2XInformationService/AtsMec_V2XInformationService.cfg_

+14 −4
Original line number Diff line number Diff line
@@ -23,7 +23,10 @@ V2XInformationServiceAPI_Pixits.PX_V2X_ECGI := "268804901557" 
V2XInformationServiceAPI_Pixits.PX_V2X_CELL_ID   := "101010101"

V2XInformationServiceAPI_Pixits.PX_V2X_ECGI_LAT  := 43.730846

V2XInformationServiceAPI_Pixits.PX_V2X_ECGI_LONG := 7.415385



# Callbacks

V2XInformationServiceAPI_Pixits.PX_PROV_UU_UNI_SUB_CALLBACK := "https://yanngarcia.ddns.net:36001/vis/v2/"

V2XInformationServiceAPI_Pixits.PX_PROV_V2X_SUB_CALLBACK := "https://yanngarcia.ddns.net:36001/vis/v2/"



[LOGGING]

# In this section you can specify the name of the log file and the classes of events
@@ -67,7 +70,7 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server 


[EXECUTE]

# In this section you can specify what parts of your test suite you want to execute.

#AtsMec_TestControl.control

#AtsMec_V2XInformationServiceAPI_TestControl.control



# 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
@@ -79,7 +82,7 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server 
#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

AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_002_OK_01

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_002_OK_02

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_002_BR

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_002_NF
@@ -131,11 +134,13 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server 
#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_009_OK_02

# Check that the IUT responds with the requested of subscription information when queried by a MEC Application - ProvChgPc5Subscription

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_009_OK_03

# Check that the IUT responds with the requested of subscription information when queried by a MEC Application - PredQosSubscription

# Check that the IUT responds with the requested of subscription information when queried by a MEC Application - V2xMsgSubscription

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_009_OK_04

# Check that the IUT responds with the requested of subscription information when queried by a MEC Application - PredQosSubscription

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_009_OK_05

AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_009_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_009_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_009_NF



#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_010_OK_01
@@ -146,10 +151,15 @@ AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_009_BR 
#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_010_BR

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_010_NF



# Check that the IUT responds with the requested of removing subscription when queried by a MEC Application - ProvChgUuUniSubscription

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_011_OK_01

# Check that the IUT responds with the requested of removing subscription when queried by a MEC Application - ProvChgUuMbmsSubscription

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_011_OK_02

# Check that the IUT responds with the requested of removing subscription when queried by a MEC Application - ProvChgPc5Subscription

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_011_OK_03

# Check that the IUT responds with the requested of removing subscription when queried by a MEC Application - V2xMsgSubscription

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_011_OK_04

# Check that the IUT responds with the requested of removing subscription when queried by a MEC Application - PredQosSubscription

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_011_OK_05

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_011_NF

titan-test-system-framework @ 6959b8be

Original line number Diff line number Diff line 
Subproject commit 6901c1c381950f308d2b1643e90757248ae99eab
 
Subproject commit 6959b8be419f3755de6f888e24bfdc8de07383a7

ttcn/AtsMec_V2XInformationService/AtsMec_V2XInformationServiceAPI_TestCases.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -2553,7 +2553,7 @@ module AtsMec_V2XInformationServiceAPI_TestCases { 
      httpPort.send(

                    m_http_request(

                                   m_http_request_get(

                                                      PICS_ROOT_API & "/vis/v2/subs/" & v_subscription_id, // Wrong URL

                                                      PICS_ROOT_API & PX_ME_V2X_URI_SUB & "?sub="& v_subscription_id, // Wrong URL

                                                      v_headers

                    )));

      f_selfOrClientSyncAndVerdict(c_prDone, e_success);

ttcn/LibMec/V2XInformationServiceAPI/ttcn/V2XInformationServiceAPI_TypesAndValues.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -763,8 +763,8 @@ module V2XInformationServiceAPI_TypesAndValues { 
    map_  (5),

    ivi   (6),

    ev_rsr(7)

  } with {

    variant "JSON: as number"

  // } with {

  //   variant "JSON: as number"

  }

  type record of MsgType MsgTypeList;