Commit 6d2eaaf1 authored by Yann Garcia's avatar Yann Garcia
Browse files

Add missing converstion unichar to char

parent 8315f79a
Loading
Loading
Loading
Loading
+3 −3
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ LibCommon_Time.PX_TAC := 30.0
LibCommon_Sync.PX_TSYNC_TIME_LIMIT := 30.0;
LibCommon_Sync.PX_TSYNC_TIME_LIMIT := 30.0;
LibCommon_Sync.PX_TSHUT_DOWN_TIME_LIMIT := 30.0;
LibCommon_Sync.PX_TSHUT_DOWN_TIME_LIMIT := 30.0;


LibHttp_Pics.PICS_HEADER_HOST := "mec-platform.etsi.org" #"192.168.1.39"
LibHttp_Pics.PICS_HEADER_HOST := "192.168.1.21" #"192.168.1.39"


LibHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/json"
LibHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/json"
LibHttp_Pics.PICS_USE_TOKEN_HEADER    := true
LibHttp_Pics.PICS_USE_TOKEN_HEADER    := true
@@ -73,7 +73,7 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec_mec030)/TCP(debug=1
#AtsMec_V2XInformationServiceAPI_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
# 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
# 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
#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
# Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application
@@ -82,7 +82,7 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec_mec030)/TCP(debug=1
#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_001_NF
#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
# 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_OK_02
#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_002_BR
#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_002_BR
#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_002_NF
#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_002_NF
+2 −2
Original line number Original line Diff line number Diff line
@@ -109,9 +109,9 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec_mec028)/TCP(debug=1
# Check that the IUT responds with an error when an not existing subscription cannot be deleted
# Check that the IUT responds with an error when an not existing subscription cannot be deleted
#AtsMec_WlanInformationAPI_TestCases.TC_MEC_MEC028_SRV_WAI_010_NF
#AtsMec_WlanInformationAPI_TestCases.TC_MEC_MEC028_SRV_WAI_010_NF
# Check that the IUT sends a notification about WLAN event notification if the MEC service has an associated subscription and the event is generated
# Check that the IUT sends a notification about WLAN event notification if the MEC service has an associated subscription and the event is generated
AtsMec_WlanInformationAPI_TestCases.TC_MEC_MEC028_SRV_WAI_011_OK
#AtsMec_WlanInformationAPI_TestCases.TC_MEC_MEC028_SRV_WAI_011_OK
# Check that the IUT responds with the list of WLAN Access Point
# Check that the IUT responds with the list of WLAN Access Point
#AtsMec_WlanInformationAPI_TestCases.TC_MEC_MEC028_SRV_WAI_012_OK
AtsMec_WlanInformationAPI_TestCases.TC_MEC_MEC028_SRV_WAI_012_OK
# Check that the IUT responds with a new measurement configuration
# Check that the IUT responds with a new measurement configuration
#AtsMec_WlanInformationAPI_TestCases.TC_MEC_MEC028_SRV_WAI_013_OK
#AtsMec_WlanInformationAPI_TestCases.TC_MEC_MEC028_SRV_WAI_013_OK
# Check that the IUT responds with an error when an invalid request is sent
# Check that the IUT responds with an error when an invalid request is sent
+3 −1
Original line number Original line Diff line number Diff line
@@ -121,7 +121,6 @@ def process_line(line):
            else:
            else:
                out_streams.write(f"hnote across #gray: error\n")
                out_streams.write(f"hnote across #gray: error\n")
            out_streams.write(f"note left: {match['hours']}:{match['minutes']}:{match['seconds']}.{match['milliseconds']}\n")
            out_streams.write(f"note left: {match['hours']}:{match['minutes']}:{match['seconds']}.{match['milliseconds']}\n")
            out_streams.write('@enduml\n')
        else:
        else:
            logger.info('Got unsupported item')
            logger.info('Got unsupported item')
        # End of 'if' statement
        # End of 'if' statement
@@ -168,6 +167,9 @@ def main():
                process_line(line)
                process_line(line)
                line = in_stream.readline()
                line = in_stream.readline()
            # End of 'for' statement
            # End of 'for' statement
            # Add the end tag
            out_streams.write('@enduml\n')
            out_streams.flush()
        # End of 'with' statement
        # End of 'with' statement
    # End of 'with' statement
    # End of 'with' statement


Original line number Original line Diff line number Diff line
Subproject commit c579f7c7175b34426e8392e1edd3885c4b9cd185
Subproject commit a8db2aefc860cdfec0b76ae767f5c91fe7ec042f
+19 −19
Original line number Original line Diff line number Diff line
@@ -521,7 +521,7 @@ module AtsMec_LocationAPI_TestCases {
        httpPort.send(
        httpPort.send(
                      m_http_request(
                      m_http_request(
                                     m_http_request_get(
                                     m_http_request_get(
                                                        PICS_ROOT_API & PX_LOC_API_AREA_SUB_URI & "/" & PX_NON_EXISTENT_SUBSCRIPTION_ID,
                                                        PICS_ROOT_API & PX_LOC_API_AREA_SUB_URI & "/" & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")),
                                                        v_headers
                                                        v_headers
                      )));
                      )));
        f_selfOrClientSyncAndVerdict(c_prDone, e_success);
        f_selfOrClientSyncAndVerdict(c_prDone, e_success);
@@ -871,7 +871,7 @@ module AtsMec_LocationAPI_TestCases {
      httpPort.send(
      httpPort.send(
                    m_http_request(
                    m_http_request(
                                   m_http_request_put(
                                   m_http_request_put(
                                                      PICS_ROOT_API & PX_LOC_API_AREA_SUB_URI & "/" & PX_NON_EXISTENT_SUBSCRIPTION_ID,
                                                      PICS_ROOT_API & PX_LOC_API_AREA_SUB_URI & "/" & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")),
                                                      v_headers,
                                                      v_headers,
                                                      m_http_message_body_json(
                                                      m_http_message_body_json(
                                                                               m_body_json_user_area_subscription(
                                                                               m_body_json_user_area_subscription(
@@ -1223,7 +1223,7 @@ module AtsMec_LocationAPI_TestCases {
      httpPort.send(
      httpPort.send(
                    m_http_request(
                    m_http_request(
                                   m_http_request_get(
                                   m_http_request_get(
                                                      PICS_ROOT_API & PX_LOC_API_DISTANCE_SUB_URI & "/" & PX_NON_EXISTENT_SUBSCRIPTION_ID,
                                                      PICS_ROOT_API & PX_LOC_API_DISTANCE_SUB_URI & "/" & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")),
                                                      v_headers
                                                      v_headers
                    )));
                    )));
      f_selfOrClientSyncAndVerdict(c_prDone, e_success);
      f_selfOrClientSyncAndVerdict(c_prDone, e_success);
@@ -1658,7 +1658,7 @@ module AtsMec_LocationAPI_TestCases {
      httpPort.send(
      httpPort.send(
                    m_http_request(
                    m_http_request(
                                   m_http_request_get(
                                   m_http_request_get(
                                                      PICS_ROOT_API & PX_ME_APP_Q_USERS_LIST_URI & "?address=" & PX_IP_ADDRESS,
                                                      PICS_ROOT_API & PX_ME_APP_Q_USERS_LIST_URI & "?address=" & oct2char(unichar2oct(PX_IP_ADDRESS, "UTF-8")),
                                                      v_headers
                                                      v_headers
                    )));
                    )));
      f_selfOrClientSyncAndVerdict(c_prDone, e_success);
      f_selfOrClientSyncAndVerdict(c_prDone, e_success);
@@ -1720,7 +1720,7 @@ module AtsMec_LocationAPI_TestCases {
      httpPort.send(
      httpPort.send(
                    m_http_request(
                    m_http_request(
                                   m_http_request_get(
                                   m_http_request_get(
                                                      PICS_ROOT_API & PX_ME_APP_Q_USERS_LIST_URI & "?address=" & PX_IP_ADDRESS & "&address=" & PX_IP_ADDRESS_1,
                                                      PICS_ROOT_API & PX_ME_APP_Q_USERS_LIST_URI & "?address=" & oct2char(unichar2oct(PX_IP_ADDRESS, "UTF-8")) & "&address=" & oct2char(unichar2oct(PX_IP_ADDRESS_1, "UTF-8")),
                                                      v_headers
                                                      v_headers
                    )));
                    )));
      f_selfOrClientSyncAndVerdict(c_prDone, e_success);
      f_selfOrClientSyncAndVerdict(c_prDone, e_success);
@@ -1786,7 +1786,7 @@ module AtsMec_LocationAPI_TestCases {
      httpPort.send(
      httpPort.send(
                    m_http_request(
                    m_http_request(
                                   m_http_request_get(
                                   m_http_request_get(
                                                      PICS_ROOT_API & PX_ME_APP_Q_USERS_LIST_URI & "?zoneId=" & PX_ZONE_ID & "&zoneId=" & PX_ZONE_ID_1,
                                                      PICS_ROOT_API & PX_ME_APP_Q_USERS_LIST_URI & "?zoneId=" & oct2char(unichar2oct(PX_ZONE_ID, "UTF-8")) & "&zoneId=" & oct2char(unichar2oct(PX_ZONE_ID_1, "UTF-8")),
                                                      v_headers
                                                      v_headers
                    )));
                    )));
      f_selfOrClientSyncAndVerdict(c_prDone, e_success);
      f_selfOrClientSyncAndVerdict(c_prDone, e_success);
@@ -1856,7 +1856,7 @@ module AtsMec_LocationAPI_TestCases {
      httpPort.send(
      httpPort.send(
                    m_http_request(
                    m_http_request(
                                   m_http_request_get(
                                   m_http_request_get(
                                                      PICS_ROOT_API & PX_ME_APP_Q_USERS_LIST_URI & "?addr=" & PX_IP_ADDRESS,  // Wrong name should trigger an error response.
                                                      PICS_ROOT_API & PX_ME_APP_Q_USERS_LIST_URI & "?addr=" & oct2char(unichar2oct(PX_IP_ADDRESS, "UTF-8")),  // Wrong name should trigger an error response.
                                                      v_headers
                                                      v_headers
                    )));
                    )));
      f_selfOrClientSyncAndVerdict(c_prDone, e_success);
      f_selfOrClientSyncAndVerdict(c_prDone, e_success);
@@ -1907,7 +1907,7 @@ module AtsMec_LocationAPI_TestCases {
      httpPort.send(
      httpPort.send(
                    m_http_request(
                    m_http_request(
                                   m_http_request_get(
                                   m_http_request_get(
                                                      PICS_ROOT_API & PX_ME_APP_Q_USERS_LIST_URI & "?address=" & PX_ACR_UNKNOWN_IP,
                                                      PICS_ROOT_API & PX_ME_APP_Q_USERS_LIST_URI & "?address=" & oct2char(unichar2oct(PX_ACR_UNKNOWN_IP, "UTF-8")),
                                                      v_headers
                                                      v_headers
                    )));
                    )));
      f_selfOrClientSyncAndVerdict(c_prDone, e_success);
      f_selfOrClientSyncAndVerdict(c_prDone, e_success);
@@ -2168,7 +2168,7 @@ module AtsMec_LocationAPI_TestCases {
        httpPort.send(
        httpPort.send(
                      m_http_request(
                      m_http_request(
                                     m_http_request_get(
                                     m_http_request_get(
                                                        PICS_ROOT_API & PX_LOC_API_USERS_SUB_URI & "?event&adress=" & PX_USER_2,
                                                        PICS_ROOT_API & PX_LOC_API_USERS_SUB_URI & "?event&adress=" & oct2char(unichar2oct(PX_USER_2, "UTF-8")),
                                                        v_headers
                                                        v_headers
                      )));
                      )));
        f_selfOrClientSyncAndVerdict(c_prDone, e_success);
        f_selfOrClientSyncAndVerdict(c_prDone, e_success);
@@ -2289,7 +2289,7 @@ module AtsMec_LocationAPI_TestCases {
        httpPort.send(
        httpPort.send(
                      m_http_request(
                      m_http_request(
                                     m_http_request_get(
                                     m_http_request_get(
                                                        PICS_ROOT_API & PX_LOC_API_USERS_SUB_URI & "/" & PX_NON_EXISTENT_SUBSCRIPTION_ID,
                                                        PICS_ROOT_API & PX_LOC_API_USERS_SUB_URI & "/" & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")),
                                                        v_headers
                                                        v_headers
                      )));
                      )));
        f_selfOrClientSyncAndVerdict(c_prDone, e_success);
        f_selfOrClientSyncAndVerdict(c_prDone, e_success);
@@ -2346,7 +2346,7 @@ module AtsMec_LocationAPI_TestCases {
        httpPort.send(
        httpPort.send(
                      m_http_request(
                      m_http_request(
                                     m_http_request_get(
                                     m_http_request_get(
                                                        PICS_ROOT_API & PX_LOC_API_USERS_SUB_URI & "?event&address=" & PX_USER_2,
                                                        PICS_ROOT_API & PX_LOC_API_USERS_SUB_URI & "?event&address=" & oct2char(unichar2oct(PX_USER_2, "UTF-8")),
                                                        v_headers
                                                        v_headers
                      )));
                      )));
        f_selfOrClientSyncAndVerdict(c_prDone, e_success);
        f_selfOrClientSyncAndVerdict(c_prDone, e_success);
@@ -2525,7 +2525,7 @@ module AtsMec_LocationAPI_TestCases {
        httpPort.send(
        httpPort.send(
                      m_http_request(
                      m_http_request(
                                     m_http_request_get(
                                     m_http_request_get(
                                                        PICS_ROOT_API & PX_LOC_API_USERS_SUB_URI & "/" & PX_NON_EXISTENT_SUBSCRIPTION_ID,
                                                        PICS_ROOT_API & PX_LOC_API_USERS_SUB_URI & "/" & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")),
                                                        v_headers
                                                        v_headers
                      )));
                      )));
        f_selfOrClientSyncAndVerdict(c_prDone, e_success);
        f_selfOrClientSyncAndVerdict(c_prDone, e_success);
@@ -3330,7 +3330,7 @@ module AtsMec_LocationAPI_TestCases {
        httpPort.send(
        httpPort.send(
                      m_http_request(
                      m_http_request(
                                     m_http_request_put(
                                     m_http_request_put(
                                                        PICS_ROOT_API & PX_LOC_API_USERS_SUB_URI & "/" & PX_NON_EXISTENT_SUBSCRIPTION_ID,
                                                        PICS_ROOT_API & PX_LOC_API_USERS_SUB_URI & "/" & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")),
                                                        v_headers,
                                                        v_headers,
                                                        m_http_message_body_json(
                                                        m_http_message_body_json(
                                                                                 m_body_json_user_location_event_subscription(
                                                                                 m_body_json_user_location_event_subscription(
@@ -3389,7 +3389,7 @@ module AtsMec_LocationAPI_TestCases {
        httpPort.send(
        httpPort.send(
                      m_http_request(
                      m_http_request(
                                     m_http_request_put(
                                     m_http_request_put(
                                                        PICS_ROOT_API & PX_LOC_API_USERS_SUB_URI & "/" & PX_NON_EXISTENT_SUBSCRIPTION_ID,
                                                        PICS_ROOT_API & PX_LOC_API_USERS_SUB_URI & "/" & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")),
                                                        v_headers,
                                                        v_headers,
                                                        m_http_message_body_json(
                                                        m_http_message_body_json(
                                                                                 m_body_json_user_location_periodic_subscription(
                                                                                 m_body_json_user_location_periodic_subscription(
@@ -3874,7 +3874,7 @@ module AtsMec_LocationAPI_TestCases {
      httpPort.send(
      httpPort.send(
                    m_http_request(
                    m_http_request(
                                    m_http_request_get(
                                    m_http_request_get(
                                                        PICS_ROOT_API & PX_LOC_API_ZONES_SUB_URI & "?event&address=" & PX_USER_2,
                                                        PICS_ROOT_API & PX_LOC_API_ZONES_SUB_URI & "?event&address=" & oct2char(unichar2oct(PX_USER_2, "UTF-8")),
                                                        v_headers
                                                        v_headers
                    )));
                    )));
      f_selfOrClientSyncAndVerdict(c_prDone, e_success);
      f_selfOrClientSyncAndVerdict(c_prDone, e_success);
@@ -4007,7 +4007,7 @@ module AtsMec_LocationAPI_TestCases {
      httpPort.send(
      httpPort.send(
                    m_http_request(
                    m_http_request(
                                    m_http_request_get(
                                    m_http_request_get(
                                                        PICS_ROOT_API & PX_LOC_API_ZONES_SUB_URI & "?event&address=" & PX_USER_2,
                                                        PICS_ROOT_API & PX_LOC_API_ZONES_SUB_URI & "?event&address=" & oct2char(unichar2oct(PX_USER_2, "UTF-8")),
                                                        v_headers
                                                        v_headers
                    )));
                    )));
      f_selfOrClientSyncAndVerdict(c_prDone, e_success);
      f_selfOrClientSyncAndVerdict(c_prDone, e_success);
@@ -4194,7 +4194,7 @@ module AtsMec_LocationAPI_TestCases {
      httpPort.send(
      httpPort.send(
                    m_http_request(
                    m_http_request(
                                    m_http_request_get(
                                    m_http_request_get(
                                                        PICS_ROOT_API & PX_LOC_API_ZONES_SUB_URI & "/" & PX_NON_EXISTENT_SUBSCRIPTION_ID,
                                                        PICS_ROOT_API & PX_LOC_API_ZONES_SUB_URI & "/" & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")),
                                                        v_headers
                                                        v_headers
                    )));
                    )));
      f_selfOrClientSyncAndVerdict(c_prDone, e_success);
      f_selfOrClientSyncAndVerdict(c_prDone, e_success);
@@ -4846,7 +4846,7 @@ module AtsMec_LocationAPI_TestCases {
      httpPort.send(
      httpPort.send(
                    m_http_request(
                    m_http_request(
                                    m_http_request_put(
                                    m_http_request_put(
                                                       PICS_ROOT_API & PX_LOC_API_ZONES_SUB_URI & PX_NON_EXISTENT_SUBSCRIPTION_ID,
                                                       PICS_ROOT_API & PX_LOC_API_ZONES_SUB_URI & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")),
                                                       v_headers,
                                                       v_headers,
                                                       m_http_message_body_json(
                                                       m_http_message_body_json(
                                                                                m_body_json_zone_location_event_subscription(
                                                                                m_body_json_zone_location_event_subscription(
@@ -4957,7 +4957,7 @@ module AtsMec_LocationAPI_TestCases {
        httpPort.send(
        httpPort.send(
                      m_http_request(
                      m_http_request(
                                     m_http_request_delete(
                                     m_http_request_delete(
                                                           PICS_ROOT_API & PX_LOC_API_ZONES_SUB_URI & "/" & PX_NON_EXISTENT_SUBSCRIPTION_ID,
                                                           PICS_ROOT_API & PX_LOC_API_ZONES_SUB_URI & "/" & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")),
                                                           v_headers
                                                           v_headers
                                                         )
                                                         )
                                      )
                                      )
Loading