Commit 7b56bc60 authored by Yann Garcia's avatar Yann Garcia
Browse files

Prepare CDM#44 demo

parent f82069fa
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ bool http_codec_cise::encode_body_xml(const LibHttp__XmlMessageBodyTypes::XmlBod
}

bool http_codec_cise::decode_body_xml(const OCTETSTRING &p_data, LibHttp__XmlMessageBodyTypes::XmlBody &p_body, const std::string& p_content_type, params* p_params) {
  loggers::get_instance().log_msg(">>> http_codec_cise::decode_body_xml: ", p_body);
  loggers::get_instance().log_msg(">>> http_codec_cise::decode_body_xml: ", p_data);

  if (_codecs["xml"].get() != nullptr) {
    p_body.raw().set_to_omit();
+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ int xml_codec::encode(const LibHttp__XmlMessageBodyTypes::XmlBody& body, OCTETST
      const http__www__cise__eu__servicemodel__v1__message::PullResponse& pull_response = msg.pull__response();
      loggers::get_instance().log_msg("xml_codec::encode: Process PullResponse: ", (const Base_Type&)pull_response);
      pull_response.encode(http__www__cise__eu__servicemodel__v1__message::PullResponse_descr_, encoding_buffer, TTCN_EncDec::CT_XER, XER_EXTENDED);
    } else if (msg.ischosen(LibHttp__XmlMessageBodyTypes::XmlBodyMsg::ALT_acknowledgement)) {
      const http__www__cise__eu__servicemodel__v1__message::Acknowledgement& acknowledgement= msg.acknowledgement();
      loggers::get_instance().log_msg("xml_codec::encode: Process Acknowledgement: ", (const Base_Type&)acknowledgement);
      acknowledgement.encode(http__www__cise__eu__servicemodel__v1__message::Acknowledgement_descr_, encoding_buffer, TTCN_EncDec::CT_XER, XER_EXTENDED);
    } else {
      loggers::get_instance().warning("xml_codec::encode: Unsupported variant");
      return -1;
+9 −14
Original line number Diff line number Diff line
@@ -7,25 +7,20 @@ LibCise_Pics.PICS_IUT_CDM_ADAPTOR := true

# LibCise
LibCise_Pics.PICS_CISE_CERTIFICATES_DB_PATH      := "/home/y.garcia/dev/cise-data-model/keystore"
LibCise_Pics.PICS_CISE_TS_CERTIFICATE            := "sim1_node01.node01.eucise.fr.pem"
LibCise_Pics.PICS_CISE_TS_SIGNING_PRIVATE_KEY    := "sim1_node01.node01.eucise.fr.pkcs8"
#LibCise_Pics.PICS_CISE_CERTIFICATES_DB_PATH      := "/home/y.garcia/var/ssl/live/yanngarcia.ddns.net"
#LibCise_Pics.PICS_CISE_TS_CERTIFICATE            := "cert.pem"
#LibCise_Pics.PICS_CISE_TS_SIGNING_PRIVATE_KEY    := "privkey.pem"
LibCise_Pics.PICS_CISE_TS_CERTIFICATE            := "ciseadaptor5.crt" #"sim1_node01.node01.eucise.fr.pem"
LibCise_Pics.PICS_CISE_TS_SIGNING_PRIVATE_KEY    := "ciseadaptor5.key" #"sim1_node01.node01.eucise.fr.pkcs8"
LibCise_Pics.PICS_CISE_TS_SIGNING_PRIVATE_PASSWD := ""
LibCise_Pics.PICS_HEADER_HOST_UT                 := "172.25.1.58"


LibCise_Pics.PICS_HEADER_HOST_UT                 := "172.25.1.58" # Adaptor

# LibHttp
LibHttp_Pics.PICS_HEADER_HOST         := "172.18.1.101"
LibHttp_Pics.PICS_HEADER_HOST         := "172.25.1.59"
LibHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/xml"
LibHttp_Pics.PICS_USE_TOKEN_HEADER    := true
#LibHttp_Pics.PICS_TOKEN_HEADER       := "Basic WrongToken"

# LibCise test parameters
LibCise_Pixits.PX_CISE_REQUEST_ACK    := false
LibCise_Pixits.PX_CISE_ADAPTOR_URI := "/cise-adapter/api/v1/messages/send"
LibCise_Pixits.PX_CISE_ADAPTOR_URI := "/cise-adapter/api/v1/messages"

[LOGGING]
# In this section you can specify the name of the log file and the classes of events
@@ -44,14 +39,14 @@ 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;json:json_codec)/TCP(debug=1,server=172.18.1.101,port=8200)"
system.httpPort_notif.params := "HTTP(codecs=xml:xml_codec;json:json_codec)/TCP(debug=1,server_mode=1,local_port=8200)"
system.httpPort.params := "HTTP(codecs=xml:xml_codec;json:json_codec)/TCP(debug=1,server=172.25.1.54,port=8200)"
system.httpPort_notif.params := "HTTP(codecs=xml:xml_codec;json:json_codec)/TCP(debug=1,server_mode=1,local_port=8200,use_ssl=0)"
# TLS
#system.httpPort.params := "HTTP(codecs=xml:xml_codec;json:json_codec)/TCP(debug=1,server=172.18.1.101,port=443,use_ssl=1,trusted_ca_list=/home/y.garcia/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem,privkey=/home/y.garcia/var/ssl/archive/yanngarcia.ddns.net/privkey1.pem,certificate=/home/y.garcia/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem)"
#system.httpPort.params := "HTTP(codecs=xml:xml_codec;json:json_codec)/TCP(debug=1,server=172.25.1.54,port=443,use_ssl=1,trusted_ca_list=/home/y.garcia/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem,privkey=/home/y.garcia/var/ssl/archive/yanngarcia.ddns.net/privkey1.pem,certificate=/home/y.garcia/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem)"
#system.httpPort_notif.params := "HTTP(codecs=xml:xml_codec;json:json_codec)/TCP(debug=1,server_mode=1,local_port=443,use_ssl=1,mutual_auth=1,mutual_tls=1,trusted_ca_list=/home/y.garcia/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem,privkey=/home/y.garcia/var/ssl/archive/yanngarcia.ddns.net/privkey1.pem,certificate=/home/y.garcia/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem)"

# UpperTester port
system.utPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=172.25.1.58,port=14000)"
system.utPort.params := "HTTP(codecs=xml:xml_codec;json:json_codec)/TCP(debug=1,server=172.25.1.58,port=14000)"

[DEFINE]
# In this section you can create macro definitions,
+1 −1
Original line number Diff line number Diff line
#!/bin/bash
#set -e
set -vx
#set -vx

clear

Original line number Diff line number Diff line
Subproject commit c4d93f6e22d71386d5a5949ba1bd447e728ea060
Subproject commit a0803fb1089eb6b1add7c00c57f4f1e77eb5cfca
Loading