Commit 87d844cc authored by Yann Garcia's avatar Yann Garcia
Browse files

Unify STF525 TTCN-3 code

parent 0be31c6d
Loading
Loading
Loading
Loading
+3 −2
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ module LibItsBtp_TypesAndValues {
      BtpRawPayload  payload optional
      BtpRawPayload  payload optional
    }
    }
    with {
    with {
      encode "LibIts_Interface"
      variant "FIELDORDER(msb)"
      variant "FIELDORDER(msb)"
    }
    }
        
        
+4 −4
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ module LibItsHttp_Functions {
      function f_init_default_headers_list(
      function f_init_default_headers_list(
                                           in charstring p_header_content_type := PICS_HEADER_CONTENT_TYPE,
                                           in charstring p_header_content_type := PICS_HEADER_CONTENT_TYPE,
                                           in charstring p_header_content_text := "",
                                           in charstring p_header_content_text := "",
                                           out HeaderLines p_headers
                                           out Headers p_headers
      ) {
      ) {
        var integer v_i := 0;
        var integer v_i := 0;
        
        
@@ -76,7 +76,7 @@ module LibItsHttp_Functions {
      function f_set_headers_list(
      function f_set_headers_list(
                                  in charstring_list p_headers_to_set,
                                  in charstring_list p_headers_to_set,
                                  in charstring_list p_headers_value,
                                  in charstring_list p_headers_value,
                                  inout HeaderLines p_headers
                                  inout Headers p_headers
                                  ) {
                                  ) {
        // Sanity checks
        // Sanity checks
        if (lengthof(p_headers_to_set) == 0) {
        if (lengthof(p_headers_to_set) == 0) {
@@ -101,7 +101,7 @@ module LibItsHttp_Functions {
      
      
      function f_remove_headers_list(
      function f_remove_headers_list(
                                     in charstring_list p_headers_to_remove,
                                     in charstring_list p_headers_to_remove,
                                     inout HeaderLines p_headers
                                     inout Headers p_headers
                                     ) {
                                     ) {
        // Sanity checks
        // Sanity checks
        if (lengthof(p_headers_to_remove) == 0) {
        if (lengthof(p_headers_to_remove) == 0) {
@@ -121,7 +121,7 @@ module LibItsHttp_Functions {
      } // End of function f_remove_headers_list
      } // End of function f_remove_headers_list
      
      
      function f_get_header(
      function f_get_header(
                            in HeaderLines p_headers,
                            in Headers p_headers,
                            in charstring p_header_name := c_header_content_text,
                            in charstring p_header_name := c_header_content_text,
                            out charstring_list p_header_value
                            out charstring_list p_header_value
                                      ) {
                                      ) {
+26 −26
Original line number Original line Diff line number Diff line
@@ -48,7 +48,7 @@ module LibItsHttp_Templates {
    
    
    group http_headers {
    group http_headers {
        
        
        template (value) HeaderLine m_header_line(
        template (value) Header m_header_line(
                                                  in template (value) charstring p_header_name,
                                                  in template (value) charstring p_header_name,
                                                  in template (value) charstring_list p_header_value
                                                  in template (value) charstring_list p_header_value
        ) := {
        ) := {
@@ -62,7 +62,7 @@ module LibItsHttp_Templates {
        
        
        template (omit) Request m_http_request_get(
        template (omit) Request m_http_request_get(
                                                   in charstring p_uri, 
                                                   in charstring p_uri, 
                                                   in template (value) HeaderLines p_headers,
                                                   in template (value) Headers p_headers,
                                                   in template (omit) HttpMessageBody p_body := omit
                                                   in template (omit) HttpMessageBody p_body := omit
        ) := {
        ) := {
          method        := "GET",
          method        := "GET",
@@ -75,7 +75,7 @@ module LibItsHttp_Templates {
        
        
        template Request mw_http_request_get(
        template Request mw_http_request_get(
                                             template (present) charstring p_uri := ?, 
                                             template (present) charstring p_uri := ?, 
                                             template (present) HeaderLines p_headers := ?,
                                             template (present) Headers p_headers := ?,
                                             template HttpMessageBody p_body := *
                                             template HttpMessageBody p_body := *
        ) := {
        ) := {
          method        := "GET",
          method        := "GET",
@@ -88,7 +88,7 @@ module LibItsHttp_Templates {
        
        
        template (omit) Request m_http_request_post(
        template (omit) Request m_http_request_post(
                                                    in charstring p_uri, 
                                                    in charstring p_uri, 
                                                    in template (value) HeaderLines p_headers,
                                                    in template (value) Headers p_headers,
                                                    in template (omit) HttpMessageBody p_body := omit
                                                    in template (omit) HttpMessageBody p_body := omit
        ) modifies m_http_request_get := {
        ) modifies m_http_request_get := {
          method        := "POST"
          method        := "POST"
@@ -96,7 +96,7 @@ module LibItsHttp_Templates {
        
        
        template Request mw_http_request_post(
        template Request mw_http_request_post(
                                              template (present) charstring p_uri := ?, 
                                              template (present) charstring p_uri := ?, 
                                              template (present) HeaderLines p_headers := ?,
                                              template (present) Headers p_headers := ?,
                                              template HttpMessageBody p_body := *
                                              template HttpMessageBody p_body := *
        ) modifies mw_http_request_get := {
        ) modifies mw_http_request_get := {
          method        := "POST"
          method        := "POST"
@@ -104,7 +104,7 @@ module LibItsHttp_Templates {
        
        
        template (omit) Request m_http_request_patch(
        template (omit) Request m_http_request_patch(
                                                     in charstring p_uri, 
                                                     in charstring p_uri, 
                                                     in template (value) HeaderLines p_headers,
                                                     in template (value) Headers p_headers,
                                                     in template (omit) HttpMessageBody p_body := omit
                                                     in template (omit) HttpMessageBody p_body := omit
        ) modifies m_http_request_get := {
        ) modifies m_http_request_get := {
          method        := "PATCH"
          method        := "PATCH"
@@ -112,7 +112,7 @@ module LibItsHttp_Templates {
        
        
        template Request mw_http_request_patch(
        template Request mw_http_request_patch(
                                              template (present) charstring p_uri := ?, 
                                              template (present) charstring p_uri := ?, 
                                              template (present) HeaderLines p_headers := ?,
                                              template (present) Headers p_headers := ?,
                                              template HttpMessageBody p_body := *
                                              template HttpMessageBody p_body := *
        ) modifies mw_http_request_get := {
        ) modifies mw_http_request_get := {
          method        := "PATCH"
          method        := "PATCH"
@@ -120,7 +120,7 @@ module LibItsHttp_Templates {
        
        
        template (omit) Request m_http_request_put(
        template (omit) Request m_http_request_put(
                                                   in charstring p_uri, 
                                                   in charstring p_uri, 
                                                   in template (value) HeaderLines p_headers,
                                                   in template (value) Headers p_headers,
                                                   in template (omit) HttpMessageBody p_body := omit
                                                   in template (omit) HttpMessageBody p_body := omit
        ) modifies m_http_request_get := {
        ) modifies m_http_request_get := {
          method        := "PUT"
          method        := "PUT"
@@ -128,7 +128,7 @@ module LibItsHttp_Templates {
        
        
        template Request mw_http_request_put(
        template Request mw_http_request_put(
                                             template (present) charstring p_uri := ?, 
                                             template (present) charstring p_uri := ?, 
                                             template (present) HeaderLines p_headers := ?,
                                             template (present) Headers p_headers := ?,
                                             template HttpMessageBody p_body := *
                                             template HttpMessageBody p_body := *
        ) modifies mw_http_request_get := {
        ) modifies mw_http_request_get := {
          method        := "PUT"
          method        := "PUT"
@@ -136,7 +136,7 @@ module LibItsHttp_Templates {
        
        
        template (omit) Request m_http_request_delete(
        template (omit) Request m_http_request_delete(
                                                      in charstring p_uri, 
                                                      in charstring p_uri, 
                                                      in template (value) HeaderLines p_headers,
                                                      in template (value) Headers p_headers,
                                                      in template (omit) HttpMessageBody p_body := omit
                                                      in template (omit) HttpMessageBody p_body := omit
        ) modifies m_http_request_get := {
        ) modifies m_http_request_get := {
          method        := "DELETE"
          method        := "DELETE"
@@ -144,7 +144,7 @@ module LibItsHttp_Templates {
        
        
        template Request mw_http_request_delete(
        template Request mw_http_request_delete(
                                                template (present) charstring p_uri := ?, 
                                                template (present) charstring p_uri := ?, 
                                                template (present) HeaderLines p_headers := ?,
                                                template (present) Headers p_headers := ?,
                                                template HttpMessageBody p_body := *
                                                template HttpMessageBody p_body := *
        ) modifies mw_http_request_get := {
        ) modifies mw_http_request_get := {
          method        := "DELETE"
          method        := "DELETE"
@@ -156,7 +156,7 @@ module LibItsHttp_Templates {
      
      
      template (value) Response m_http_response_ok(
      template (value) Response m_http_response_ok(
                                                   in template (value) HttpMessageBody p_body,
                                                   in template (value) HttpMessageBody p_body,
                                                   in template (value) HeaderLines p_header
                                                   in template (value) Headers p_header
      ) := {
      ) := {
          version_major := 1,
          version_major := 1,
          version_minor := 1,
          version_minor := 1,
@@ -167,7 +167,7 @@ module LibItsHttp_Templates {
      } // End of template m_http_response_ok
      } // End of template m_http_response_ok
      
      
      template (value) Response m_http_response_ok_no_body(
      template (value) Response m_http_response_ok_no_body(
                                                           in template (value) HeaderLines p_header
                                                           in template (value) Headers p_header
      ) := {
      ) := {
          version_major := 1,
          version_major := 1,
          version_minor := 1,
          version_minor := 1,
@@ -178,7 +178,7 @@ module LibItsHttp_Templates {
      } // End of template m_http_response_ok_no_body
      } // End of template m_http_response_ok_no_body
      
      
      template (value) Response m_http_response_204_no_content(
      template (value) Response m_http_response_204_no_content(
                                                               in template (value) HeaderLines p_header
                                                               in template (value) Headers p_header
      ) modifies m_http_response_ok_no_body := {
      ) modifies m_http_response_ok_no_body := {
          statuscode    := 204,
          statuscode    := 204,
          statustext    := "No Content"
          statustext    := "No Content"
@@ -186,7 +186,7 @@ module LibItsHttp_Templates {
      
      
      template (present) Response mw_http_response_ok(
      template (present) Response mw_http_response_ok(
                                                      template (present) HttpMessageBody p_body := ?,
                                                      template (present) HttpMessageBody p_body := ?,
                                                      template (present) HeaderLines p_header := ?
                                                      template (present) Headers p_header := ?
      ) := {
      ) := {
          version_major := 1,
          version_major := 1,
          version_minor := 1,
          version_minor := 1,
@@ -198,7 +198,7 @@ module LibItsHttp_Templates {
      
      
      template (present) Response mw_http_response_201_created(
      template (present) Response mw_http_response_201_created(
                                                               template (present) HttpMessageBody p_body := ?,
                                                               template (present) HttpMessageBody p_body := ?,
                                                               template (present) HeaderLines p_header := ?
                                                               template (present) Headers p_header := ?
      ) modifies mw_http_response_ok := {
      ) modifies mw_http_response_ok := {
          statuscode    := 201,
          statuscode    := 201,
          statustext    := "Created"
          statustext    := "Created"
@@ -206,7 +206,7 @@ module LibItsHttp_Templates {
      
      
      template (present) Response mw_http_response_202_accepted(
      template (present) Response mw_http_response_202_accepted(
                                                                template (present) HttpMessageBody p_body := ?,
                                                                template (present) HttpMessageBody p_body := ?,
                                                                template (present) HeaderLines p_header := ?
                                                                template (present) Headers p_header := ?
      ) modifies mw_http_response_ok := {
      ) modifies mw_http_response_ok := {
          statuscode    := 202,
          statuscode    := 202,
          statustext    := "Accepted"
          statustext    := "Accepted"
@@ -214,7 +214,7 @@ module LibItsHttp_Templates {
      
      
      template (present) Response mw_http_response_204_no_content(
      template (present) Response mw_http_response_204_no_content(
                                                                   template (present) HttpMessageBody p_body := ?,
                                                                   template (present) HttpMessageBody p_body := ?,
                                                                   template (present) HeaderLines p_header := ?
                                                                   template (present) Headers p_header := ?
      ) modifies mw_http_response_ok := {
      ) modifies mw_http_response_ok := {
          statuscode    := 204,
          statuscode    := 204,
          statustext    := "No Content"
          statustext    := "No Content"
@@ -222,7 +222,7 @@ module LibItsHttp_Templates {
      
      
      template (value) Response m_http_response_ko(
      template (value) Response m_http_response_ko(
                                                   in template (value) HttpMessageBody p_body,
                                                   in template (value) HttpMessageBody p_body,
                                                   in template (value) HeaderLines p_header,
                                                   in template (value) Headers p_header,
                                                   in template (value) integer p_statuscode := 404,
                                                   in template (value) integer p_statuscode := 404,
                                                   in template (value) charstring p_statustext := "Not found"
                                                   in template (value) charstring p_statustext := "Not found"
      ) := {
      ) := {
@@ -235,7 +235,7 @@ module LibItsHttp_Templates {
      } // End of template m_http_response_ko
      } // End of template m_http_response_ko
      
      
      template (value) Response m_http_response_ko_no_body(
      template (value) Response m_http_response_ko_no_body(
                                                           in template (value) HeaderLines p_header,
                                                           in template (value) Headers p_header,
                                                           in template (value) integer p_statuscode := 404,
                                                           in template (value) integer p_statuscode := 404,
                                                           in template (value) charstring p_statustext := "Not found"
                                                           in template (value) charstring p_statustext := "Not found"
      ) := {
      ) := {
@@ -249,7 +249,7 @@ module LibItsHttp_Templates {
      
      
      template Response mw_http_response_ko(
      template Response mw_http_response_ko(
                                            template HttpMessageBody p_body  := *,
                                            template HttpMessageBody p_body  := *,
                                            template (present) HeaderLines p_header := ?
                                            template (present) Headers p_header := ?
      ) := {
      ) := {
          version_major := 1,
          version_major := 1,
          version_minor := 1,
          version_minor := 1,
@@ -261,7 +261,7 @@ module LibItsHttp_Templates {
      
      
      template Response mw_http_response_400_bad_request(
      template Response mw_http_response_400_bad_request(
                                                         template HttpMessageBody p_body  := *,
                                                         template HttpMessageBody p_body  := *,
                                                         template (present) HeaderLines p_header := ?
                                                         template (present) Headers p_header := ?
      ) modifies mw_http_response_ko := {
      ) modifies mw_http_response_ko := {
          statuscode    := 400,
          statuscode    := 400,
          statustext    := "Bad Request"
          statustext    := "Bad Request"
@@ -269,7 +269,7 @@ module LibItsHttp_Templates {
      
      
      template Response mw_http_response_401_unauthorized(
      template Response mw_http_response_401_unauthorized(
                                                          template HttpMessageBody p_body  := *,
                                                          template HttpMessageBody p_body  := *,
                                                          template (present) HeaderLines p_header := ?
                                                          template (present) Headers p_header := ?
      ) modifies mw_http_response_ko := {
      ) modifies mw_http_response_ko := {
          statuscode    := 401,
          statuscode    := 401,
          statustext    := "Unauthorized"
          statustext    := "Unauthorized"
@@ -277,7 +277,7 @@ module LibItsHttp_Templates {
      
      
      template Response mw_http_response_403_forbidden(
      template Response mw_http_response_403_forbidden(
                                                       template HttpMessageBody p_body  := *,
                                                       template HttpMessageBody p_body  := *,
                                                       template (present) HeaderLines p_header := ?
                                                       template (present) Headers p_header := ?
      ) modifies mw_http_response_ko := {
      ) modifies mw_http_response_ko := {
          statuscode    := 403,
          statuscode    := 403,
          statustext    := "Forbidden"
          statustext    := "Forbidden"
@@ -285,7 +285,7 @@ module LibItsHttp_Templates {
      
      
      template Response mw_http_response_404_not_found(
      template Response mw_http_response_404_not_found(
                                                       template HttpMessageBody p_body  := *,
                                                       template HttpMessageBody p_body  := *,
                                                       template (present) HeaderLines p_header := ?
                                                       template (present) Headers p_header := ?
      ) modifies mw_http_response_ko := {
      ) modifies mw_http_response_ko := {
          statuscode    := 404,
          statuscode    := 404,
          statustext    := "Not Found"
          statustext    := "Not Found"
@@ -293,7 +293,7 @@ module LibItsHttp_Templates {
      
      
      template Response mw_http_response_412_precondition_failed(
      template Response mw_http_response_412_precondition_failed(
                                                                 template HttpMessageBody p_body  := *,
                                                                 template HttpMessageBody p_body  := *,
                                                                 template (present) HeaderLines p_header := ?
                                                                 template (present) Headers p_header := ?
      ) modifies mw_http_response_ko := {
      ) modifies mw_http_response_ko := {
          statuscode    := 412,
          statuscode    := 412,
          statustext    := "Precondition Failed"
          statustext    := "Precondition Failed"
+4 −4
Original line number Original line Diff line number Diff line
@@ -29,21 +29,21 @@ module LibItsHttp_TypesAndValues {
    const integer c_http_version_minor := PICS_HTTP_VERSION_MINOR;
    const integer c_http_version_minor := PICS_HTTP_VERSION_MINOR;
    
    
    type record of charstring charstring_list;
    type record of charstring charstring_list;
    type record HeaderLine {
    type record Header {
      charstring        header_name,
      charstring        header_name,
      charstring_list   header_value optional
      charstring_list   header_value optional
    } with { 
    } with { 
        variant "FIELDORDER(msb)" 
        variant "FIELDORDER(msb)" 
    }
    }
    
    
    type record of HeaderLine HeaderLines;
    type record of Header Headers;
    
    
    type record Request {
    type record Request {
      charstring method,
      charstring method,
      charstring uri,
      charstring uri,
      integer version_major,
      integer version_major,
      integer version_minor,
      integer version_minor,
      HeaderLines header,
      Headers header,
      HttpMessageBody body optional
      HttpMessageBody body optional
    } with { 
    } with { 
        variant "FIELDORDER(msb)" 
        variant "FIELDORDER(msb)" 
@@ -54,7 +54,7 @@ module LibItsHttp_TypesAndValues {
      integer version_minor,
      integer version_minor,
      integer statuscode,
      integer statuscode,
      charstring statustext,
      charstring statustext,
      HeaderLines header,
      Headers header,
      HttpMessageBody body optional
      HttpMessageBody body optional
    } with { 
    } with { 
        variant "FIELDORDER(msb)" 
        variant "FIELDORDER(msb)" 
+1 −0
Original line number Original line Diff line number Diff line
@@ -112,6 +112,7 @@ module LibItsIvim_TestSystem {
        
        
        var UtIvimEventIndList vc_utEvents := {};
        var UtIvimEventIndList vc_utEvents := {};
        
        
        var boolean vc_ivimDefaultActive := true;
    } // End of component ItsIvim
    } // End of component ItsIvim


    group facilityPrimitives {
    group facilityPrimitives {
Loading