Commit 0dbb6c3b authored by Yann Garcia's avatar Yann Garcia
Browse files

End of validation of AtsMec_V2XInformationService

parent b2cef6f1

ccsrc/Protocols/Json/json_codec_mec030.cc

+9 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ int json_codec_mec030::encode (const LibHttp__JsonMessageBodyTypes::JsonBody& ms 
    const V2XInformationServiceAPI__TypesAndValues::V2xMsgDistributionServerInfo& v2x_msg_distribution_server_info = msg.v2xMsgDistributionServerInfo();

    v2x_msg_distribution_server_info.encode(V2XInformationServiceAPI__TypesAndValues::V2xMsgDistributionServerInfo_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_v2xMsgPublication)) {

    const V2XInformationServiceAPI__TypesAndValues::V2xMsgPublication& v2x_msg_publication = msg.v2xMsgPublication();

    v2x_msg_publication.encode(V2XInformationServiceAPI__TypesAndValues::V2xMsgPublication_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_provChgUuUniSubscription)) {

    const V2XInformationServiceAPI__TypesAndValues::ProvChgUuUniSubscription& prov_chg_uu_uni_subscription = msg.provChgUuUniSubscription();

    prov_chg_uu_uni_subscription.encode(V2XInformationServiceAPI__TypesAndValues::ProvChgUuUniSubscription_descr_, encoding_buffer, TTCN_EncDec::CT_JSON);
@@ -101,6 +105,11 @@ int json_codec_mec030::decode (const OCTETSTRING& p_data, LibHttp__JsonMessageBo 
    TTCN_Buffer decoding_buffer_(OCTETSTRING(str.length(), (const unsigned char*)str.c_str()));

    predicted_qos.decode(V2XInformationServiceAPI__TypesAndValues::PredictedQos_descr_, decoding_buffer_, TTCN_EncDec::CT_JSON);

    msg.predictedQos() = predicted_qos;

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

    V2XInformationServiceAPI__TypesAndValues::SubscriptionLinkList subscription_link_list;

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

    subscription_link_list.decode(V2XInformationServiceAPI__TypesAndValues::SubscriptionLinkList_descr_, decoding_buffer_, TTCN_EncDec::CT_JSON);

    msg.subscriptionLinkList__v2x() = subscription_link_list;

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

    V2XInformationServiceAPI__TypesAndValues::ProvChgUuUniSubscription prov_chg_uu_uni_subscription;

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

etc/AtsMec_FederationEnablement/AtsMec_FederationEnablement.cf_

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec_mec040)/TCP(debug=1 
#AtsMec_TestControl.control



# Check that the IUT responds with a list of all available systemInfo when requested by a MEC Orchestrator - No query parameters

#AtsMec_FederationEnablementAPI_TestCases.TC_MEC_MEC040_SRV_MEF_001_OK_01

AtsMec_FederationEnablementAPI_TestCases.TC_MEC_MEC040_SRV_MEF_001_OK_01

# Check that the IUT responds with a selection of all available systemInfo when requested by a MEC Orchestrator - SystemId query parameters

#AtsMec_FederationEnablementAPI_TestCases.TC_MEC_MEC040_SRV_MEF_001_OK_02

# Check that the IUT responds with a selection of all available systemInfo when requested by a MEC Orchestrator - Multiple SystemId query parameters
@@ -89,7 +89,7 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec_mec040)/TCP(debug=1 
# Check that the IUT responds with an error when selection is not applicable - SystemProvider

#AtsMec_FederationEnablementAPI_TestCases.TC_MEC_MEC040_SRV_MEF_001_NF_03

# Check that the IUT responds with an error when request is malformed

AtsMec_FederationEnablementAPI_TestCases.TC_MEC_MEC040_SRV_MEF_001_BR

#AtsMec_FederationEnablementAPI_TestCases.TC_MEC_MEC040_SRV_MEF_001_BR



# Check that the IUT creates a new systemInfo when requested by a MEC Orchestrator

#AtsMec_FederationEnablementAPI_TestCases.TC_MEC_MEC040_SRV_MEF_002_OK

etc/AtsMec_V2XInformationService/AtsMec_V2XInformationService.cfg_

+52 −5
Original line number Diff line number Diff line
@@ -25,8 +25,28 @@ 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/"

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

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

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

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



# MQTT server

V2XInformationServiceAPI_Pixits.PX_V2X_MC_SERVER := "172.29.10.56";

V2XInformationServiceAPI_Pixits.PX_V2X_MC_PORT := "1883";



# PredictedQos

V2XInformationServiceAPI_Pixits.PX_LOC_GRANULARITY := "30"

V2XInformationServiceAPI_Pixits.PX_QoS_LAT_1       := 43.729416

V2XInformationServiceAPI_Pixits.PX_QoS_LON_1       := 7.414853

V2XInformationServiceAPI_Pixits.PX_QoS_TS_1        := 1653295620

V2XInformationServiceAPI_Pixits.PX_QoS_LAT_2       := 43.732456

V2XInformationServiceAPI_Pixits.PX_QoS_LON_2       := 7.418417

V2XInformationServiceAPI_Pixits.PX_QoS_TS_2        := 1653299220

V2XInformationServiceAPI_Pixits.PX_STREAM_ID_1     := "0"

V2XInformationServiceAPI_Pixits.PX_STREAM_ID_2     := "1"

V2XInformationServiceAPI_Pixits.PX_STREAM_ID_3     := "2"

V2XInformationServiceAPI_Pixits.PX_QoS_LAT_1_OUT_OF_COVERAGE := 45.729416

V2XInformationServiceAPI_Pixits.PX_QoS_LON_1_OUT_OF_COVERAGE := 10.414853



[LOGGING]

# In this section you can specify the name of the log file and the classes of events
@@ -73,7 +93,7 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec_mec030)/TCP(debug=1 
#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

#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
@@ -83,13 +103,21 @@ AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_001_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_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

#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_BR_01

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_002_BR_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_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



# Check that the IUT processes properly a request to information of V2X Message Distribution servers
@@ -99,18 +127,29 @@ AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_001_OK_01 
# 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_004_NF



# Check that the IUT sends a request about QoS information for a vehicular UE when queried by a MEC Application

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_005_OK

# 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_005_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_005_NF



# Check that the IUT processes properly a request to publish a V2X message

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_006_OK

# 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_006_BR



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

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_007_OK_01

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

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_007_OK_02

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

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_007_OK_03

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

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_007_OK_04

# 

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_007_OK_05

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

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_007_BR



# Check that the IUT responds with the requested to create a subscription - ProvChgUuUniSubscription
@@ -143,13 +182,20 @@ AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_001_OK_01 
# 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



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

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_010_OK_01

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

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_010_OK_02

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

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_010_OK_03

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

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_010_OK_04

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

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_010_OK_05

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

#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 correct error code when a request with incorrect parameters is sent by a MEC Application

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
@@ -161,6 +207,7 @@ AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_001_OK_01 
#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

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

#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_011_NF



[GROUPS]

ttcn/AtsMec_V2XInformationService/AtsMec_V2XInformationServiceAPI_TestCases.ttcn

+193 −123

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/AtsMec_V2XInformationService/AtsMec_V2XInformationServiceAPI_TestControl.ttcn

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ module AtsMec_V2XInformationServiceAPI_TestControl { 


      execute(TC_MEC_MEC030_SRV_V2X_002_OK_01());

      execute(TC_MEC_MEC030_SRV_V2X_002_OK_02());

      execute(TC_MEC_MEC030_SRV_V2X_002_BR());

      execute(TC_MEC_MEC030_SRV_V2X_002_BR_01());

      execute(TC_MEC_MEC030_SRV_V2X_002_BR_02());

      execute(TC_MEC_MEC030_SRV_V2X_002_NF());



      execute(TC_MEC_MEC030_SRV_V2X_003_OK_01());