Commit d8ac6624 authored by Yann Garcia's avatar Yann Garcia
Browse files

Finalyze TC_CDM_NODE_PULL_REQUEST_BV_01_01

parent 7f1ceb28

etc/AtsCise/AtsCise_Cnit.cf_

+5 −4
Changes for etc/AtsCise/AtsCise_Cnit.cf_: 5 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ LibHttp_Pics.PICS_USE_TOKEN_HEADER := true 


# LibCise test parameters

LibCise_Pixits.PX_CISE_REQUEST_ACK    := false

LibCise_Pixits.PX_CISE_ADAPTOR_URI := "/cise-adapter/api/v1/messages"



LibCise_Pics.PICS_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
@@ -40,7 +41,7 @@ LogEventTypes:= Yes 
# 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.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)"

system.httpPort_notif.params := "HTTP(codecs=xml:xml_codec;json:json_codec)/TCP(debug=1,server_mode=1,local_port=8300,use_ssl=0)"

# TLS

#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)"
@@ -74,10 +75,10 @@ system.utPort.params := "HTTP(codecs=xml:xml_codec;json:json_codec)/TCP(debug=1, 
#AtsCise_TestControl.control



# Check that the IUT responds with an HTPP 200 OK Acknowledgment response when receiving a PullRequest for vessels with discovery based on sea basin - no Acknowledgment required

#AtsCise_TestCases.TC_CDM_NODE_PULL_REQUEST_BV_01_01

AtsCise_TestCases.TC_CDM_NODE_PULL_REQUEST_BV_01_01



# Check that the IUT sends a PullRequest for vessels with discovery based on sea basin - no Acknowledgment required

AtsCise_TestCases.TC_CDM_ADAPTOR_PULL_REQUEST_BV_01

#AtsCise_TestCases.TC_CDM_ADAPTOR_PULL_REQUEST_BV_01



[GROUPS]

# In this section you can specify groups of hosts. These groups can be used inside the

ttcn/AtsCise/AtsCise_TestCases.ttcn

+49 −176

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/LibCise/LibCdm4/http_www_cise_eu_servicemodel_v1_message.ttcn

+4 −4
Changes for ttcn/LibCise/LibCdm4/http_www_cise_eu_servicemodel_v1_message.ttcn: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ success. */ 
	XSD.String ackDetail length(5000) optional,

	/* Used in operations like to Discovery or Get Subscribers to return the

results of the operation. */

	//record of Service_1 discoveredServices_list							optional, /**modified**/

	record of Service_1 discoveredServices_list							optional, /**modified**/

	XSD.String elem optional

}

with {
@@ -195,7 +195,7 @@ with { 
  variant (AckCode) "name as capitalized";

  variant (ackDetail) "name as capitalized";

  //variant (discoveredServices_list) "untagged";

  //variant (discoveredServices_list[-]) "name as 'DiscoveredServices'";

  variant (discoveredServices_list[-]) "name as 'DiscoveredServices'";

};
@@ -532,7 +532,7 @@ with { 
  variant (reliability) "name as capitalized";

  variant (ccRecipients_list) "untagged";

  variant (ccRecipients_list[-]) "name as 'CcRecipients'";

  variant (elem) "anyElement from 'http://www.w3.org/2000/09/xmldsig#/'";// except unqualified, 'http://www.cise.eu/servicemodel/v1/message/'";

  variant (elem) "anyElement except unqualified, 'http://www.cise.eu/servicemodel/v1/message/'";//"anyElement from 'http://www.w3.org/2000/09/xmldsig#/'";// except unqualified, 'http://www.cise.eu/servicemodel/v1/message/'";

  variant (errorDetail) "name as capitalized";

  variant (resultCode) "name as capitalized";

  variant (fulfils) "name as capitalized";
@@ -614,7 +614,7 @@ with { 
  variant (reliability) "name as capitalized";

  variant (ccRecipients_list) "untagged";

  variant (ccRecipients_list[-]) "name as 'CcRecipients'";

  variant (elem) "anyElement except unqualified, 'http://www.cise.eu/servicemodel/v1/message/'"

  variant (elem) "anyElement except unqualified, 'http://www.cise.eu/servicemodel/v1/message/'";

  variant (pullType) "name as capitalized";

  variant (responseTimeOut) "name as capitalized";

  variant (requests) "name as capitalized";

ttcn/LibCise/LibCdm5/module.mk

+0 −1
Changes for ttcn/LibCise/LibCdm5/module.mk: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ sources := \ 
    http_www_cise_eu_datamodel_v1_entity_uniqueidentifier.ttcn \

    http_www_cise_eu_datamodel_v1_entity_vessel.ttcn           \

    http_www_cise_eu_datamodel_v1_relationship.ttcn            \

    NoTargetNamespace.ttcn





modules := ../LibCdm4

ttcn/LibCise/ttcn/LibCise_Functions.ttcn

+76 −25

File changed.

Preview size limit exceeded, changes collapsed.