Commit 408db901 authored by YannGarcia's avatar YannGarcia
Browse files

Finalyze signature process

parent 477b7229

cise.code-workspace

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ 
		},

		{

			"path": "../../tmp/ttcn_cisetp-main/ttcn_cisetp-main"

		},

		{

			"path": "../../frameworks/cisedist"

		}

	],

	"settings": {

etc/AtsCise/AtsCise_Cnit.cf_

+8 −8
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@ LibCise_Pics.PICS_IUT_ADAPTOR := true 


# LibCise

LibCise_Pics.PICS_CISE_SECURITY             := true

LibCise_Pics.PICS_CISE_CERTIFICATES_DB_PATH := "/home/yann/var/ssl/live/yanngarcia.ddns.net/";

LibCise_Pixits.PX_SECURITY_SIGN_CERT := "cert.pem";

LibCise_Pics.PICS_CISE_CERTIFICATES_DB_PATH := "/home/yann/var/ssl/live/yanngarcia.ddns.net/"

LibCise_Pixits.PX_SECURITY_SIGN_CERT        := "cert.pem"



# LibHttp

LibHttp_Pics.PICS_HEADER_HOST         := "192.168.1.39"

LibHttp_Pics.PICS_HEADER_HOST         := "172.18.1.101"

LibHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/xml"

LibHttp_Pics.PICS_USE_TOKEN_HEADER    := true

#LibHttp_Pics.PICS_TOKEN_HEADER       := "Basic WrongToken"
@@ -33,10 +33,10 @@ LogEventTypes:= Yes 
[TESTPORT_PARAMETERS]

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

# Unsecured

system.httpPort.params := "HTTP(codecs=xml:xml_codec)/TCP(debug=1,server=192.168.1.39,port=30181)"

system.httpPort_notif.params := "HTTP(codecs=xml:xml_codec)/TCP(debug=1,server_mode=1,local_port=30181)"

system.httpPort.params := "HTTP(codecs=xml:xml_codec)/TCP(debug=1,server=172.18.1.101,port=8200)"

system.httpPort_notif.params := "HTTP(codecs=xml:xml_codec)/TCP(debug=1,server_mode=1,local_port=8200)"

# TLS

#system.httpPort.params := "HTTP(codecs=xml:xml_codec)/TCP(debug=1,server=192.168.1.39,port=443,use_ssl=1,trusted_ca_list=/home/yann/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem,privkey=/home/yann/var/ssl/archive/yanngarcia.ddns.net/privkey1.pem,certificate=/home/yann/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem)"

#system.httpPort.params := "HTTP(codecs=xml:xml_codec)/TCP(debug=1,server=172.18.1.101,port=443,use_ssl=1,trusted_ca_list=/home/yann/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem,privkey=/home/yann/var/ssl/archive/yanngarcia.ddns.net/privkey1.pem,certificate=/home/yann/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem)"

#system.httpPort_notif.params := "HTTP(codecs=xml:xml_codec)/TCP(debug=1,server_mode=1,local_port=443,use_ssl=1,mutual_auth=1,mutual_tls=1,trusted_ca_list=/home/yann/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem,privkey=/home/yann/var/ssl/archive/yanngarcia.ddns.net/privkey1.pem,certificate=/home/yann/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem)"



[DEFINE]
@@ -65,8 +65,8 @@ system.httpPort_notif.params := "HTTP(codecs=xml:xml_codec)/TCP(debug=1,server_m 
#AtsCise_TestControl.control



# Check that the IUT sends a PullResponse when recieving a PullRequest with no Acknowledgement

#AtsCise_TestCases.TC_CISE_xxx_BV_01

AtsCise_TestCases.TC_CISE_xxx_BV_02

#AtsCise_TestCases.TC_CDM_NODE_PULL_REQUEST_01

AtsCise_TestCases.TC_CDM_NODE_PULL_REQUEST_02

# Check that the IUT is requested to send a PullRequest with no Acknowledgement, the IUT sends a PullRequest with entry Acknowledgement set to False

#AtsCise_TestCases.TC_CISE_yyy_BV_01

test-purposes/AtsCise/AtsCise.tplan2

+11 −13
Original line number Diff line number Diff line 
/**

 * Copyright (c) ETSI 2018-2022.

 * Copyright (c) ETSI 2018-2023.

 * Released under BSD 3-clause license. For more information visit https://forge.etsi.org/legal-matters

 */
@@ -8,7 +8,7 @@ Package CISE { 
  import all from CISE_Common;



  Test Purpose {

     TP Id "TC_CISE_NODE_BV_01"

     TP Id "TP_CDM_NODE_PULL_REQUEST_01"



     Test objective

       "Check that the IUT sends a PullResponse when recieving a PullRequest with no Acknowledgement"
@@ -21,16 +21,15 @@ Package CISE { 
    PICS Selection PICS_IUT_NODE and not PICS_CISE_SECURITY



    Initial conditions  with {

      the IUT entity being_in idle_state, 

      the IUT is configured with security

      ;

      the IUT entity isInIdleState and

      the IUT entity isConfiguredWithSecurity

    }



    Expected behaviour

      ensure that {

        when {

          the IUT entity receives a vGET containing

            uri indicating value "xxx"

            uri indicating value "xxx",

            query_parameters containing

              vPullRequest indicating value PX_PULL_REQUEST // TODO To be refined

            ;
@@ -47,10 +46,10 @@ Package CISE { 
          to the LS entity

        }

      }

  } // End of TP "TC_CISE_NODE_BV_01"

  } // End of TP "TP_CDM_NODE_PULL_REQUEST_01"



  Test Purpose {

     TP Id "TC_CISE_NODE_BV_02"

     TP Id "TP_CDM_NODE_PULL_REQUEST_02"



     Test objective

       "Check that the IUT sends a PullResponse when recieving a PullRequest with no Acknowledgement, with security"
@@ -63,16 +62,15 @@ Package CISE { 
    PICS Selection PICS_IUT_NODE and PICS_CISE_SECURITY



    Initial conditions  with {

      the IUT entity being_in idle_state and, 

      the IUT is configured with security

      ;

      the IUT entity isInIdleState and

      the IUT entity isConfiguredWithSecurity

    }



    Expected behaviour

      ensure that {

        when {

          the IUT entity receives a vGET containing

            uri indicating value "xxx"

            uri indicating value "xxx",

            query_parameters containing

              vPullRequest containing

                vSignature  // TODO To be refined
@@ -90,6 +88,6 @@ Package CISE { 
          to the LS entity

        }

      }

  } // End of TP "TC_CISE_NODE_BV_02"

  } // End of TP "TP_CDM_NODE_PULL_REQUEST_02"



} // End of package CISE
 
 No newline at end of file

test-purposes/cise-common.tplan2

+15 −14
Original line number Diff line number Diff line
@@ -22,14 +22,15 @@ Package CISE_Common { 
    - receives      // component receives an HTTP request

    - sends         // component sends an HTTP response

    - having

    - idle_state 

    - isInIdleState

    - isConfiguredWithSecurity

    ;

  }

  

  Data {

    type STRING;

    type XML;

    type string with s of type STRING

    type string with s of type STRING;



    type HttpHeaders with

        // content_type is optional, since not present in GET and DELETE
@@ -47,7 +48,7 @@ Package CISE_Common { 
        headers of type HttpHeaders,

        status_code of type STRING,

        // body is optional, since not present in GET and DELETE 

        body of type JSON  

        body of type XML

    ;



    STRING "application/xml;charset=utf-8";
@@ -62,7 +63,7 @@ Package CISE_Common { 
    ;



    HttpHeaders vHeadersGet containing

        accept set to "application/json",

        accept set to "application/xml",

        authorization set to VALID_TOKEN

    ;
@@ -101,18 +102,18 @@ Package CISE_Common { 
        headers set to vHeadersResponse

    ;



    PullRequest vPullRequest

    ;660855792



    Signature vSignature

    ;

//    PullRequest vPullRequest

//    ;

//

//    Signature vSignature

//    ;



  }



  const {

    PX_CISE_PULL_REQUEST_URI,

    PX_CISE_SERVICE_ID

  }

//  const {

//    PX_CISE_PULL_REQUEST_URI,

//    PX_CISE_SERVICE_ID

//  }



  Configuration {

ttcn/AtsCise/AtsCise_TestCases.ttcn

+4 −4
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ module AtsCise_TestCases { 
  import from http_www_cise_eu_datamodel_v1_entity_vessel all;

  import from http_www_cise_eu_datamodel_v1_entity_cargo all;



  group test1 {

  group serviceexits {



    /**

     * @desc Check that the IUT sends a PullResponse when recieving a PullRequest with no Acknowledgement

     * @see ETSI GS CDM 004 Clause 5.4.2 Pull

     */

    testcase TC_CISE_NODE_BV_01() runs on HttpComponent system HttpTestAdapter {

    testcase TC_CDM_NODE_PULL_REQUEST_01() runs on HttpComponent system HttpTestAdapter {

      // Local variables

      var Headers v_headers;

      var HttpMessage v_response;
@@ -54,7 +54,7 @@ module AtsCise_TestCases { 
      httpPort.send(

                    m_http_request(

                                   m_http_request_get(

                                                      PICS_ROOT_API & PX_CISE_PULL_REQUEST_URI & "?messageId=" & v_message_id,

                                                      PICS_ROOT_API & PX_CISE_PULL_REQUEST_URI & "/messageId=" & v_message_id,

                                                      v_headers,

                                                      mw_http_message_body_xml(

                                                                               m_xml_body_pull_request(
@@ -139,7 +139,7 @@ module AtsCise_TestCases { 
     * @desc Check that the IUT sends a PullResponse when recieving a PullRequest with no Acknowledgement, with security

     * @see ETSI GS CDM 004 Clause 5.4.2 Pull

     */

    testcase TC_CISE_NODE_BV_02() runs on HttpComponent system HttpTestAdapter {

    testcase TC_CDM_NODE_PULL_REQUEST_02() runs on HttpComponent system HttpTestAdapter {

      // Local variables

      var Headers v_headers;

      var HttpMessage v_response;