Add Vessel & Cargo templates (07510dfd) · Commits · CDM - Common information sharing environment and Data Model / CISE Data Model

cise.code-workspace

+6 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,12 @@
		},
		{
		"path": "../../frameworks/xmlsec"
		},
		{
		"path": "../../tmp/xer_decoding_issue"
		},
		{
		"path": "../../tmp/ttcn_cisetp-main/ttcn_cisetp-main"
		}
		],
		"settings": {

etc/AtsCise/AtsCise_mockoon.cf_

+1 −1

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

		# LibCise
		LibCise_Pics.PICS_CISE_SECURITY := true
		LibCise_Pics.PICS_CISE_CERTIFICATES_DB_PATH := "/home/etsi/var/ssl/live/yanngarcia.ddns.net/";
		LibCise_Pics.PICS_CISE_CERTIFICATES_DB_PATH := "/home/yann/var/ssl/live/yanngarcia.ddns.net/";
		LibCise_Pixits.PX_SECURITY_SIGN_CERT := "cert.pem";

		# LibHttp

ttcn/AtsCise/AtsCise_TestCases.ttcn

+9 −10

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@ module AtsCise_TestCases {
		// LibCise
		import from LibCise_Pics all;
		import from LibCise_Pixits all;
		import from LibCise_Templates all;
		import from LibCise_Functions all;

		// TODO Add here your custom RFCs import
		@@ -71,10 +72,9 @@ module AtsCise_TestCases {
		vesselService
		),
		{},
		-,
		request,
		{},
		-, -,
		-, -, -,
		v_correlation_id,
		false, // RequiresAck
		m_service( // Recipient
		@@ -114,9 +114,9 @@ module AtsCise_TestCases {
		v_date_time,
		v_message_id,
		high,
		-, -, -,
		success,
		-, -,
		success,
		-, -, -,
		v_correlation_id
		)))))) -> value v_response {
		tc_ac.stop;
		@@ -175,10 +175,9 @@ module AtsCise_TestCases {
		vesselService
		),
		{},
		-,
		request,
		{},
		-, -,
		-, -, -,
		v_correlation_id,
		false, // RequiresAck
		m_service( // Recipient
		@@ -238,7 +237,7 @@ module AtsCise_TestCases {
		v_date_time,
		v_message_id,
		high,
		-, -, -,
		-, -,
		success,
		-, -,
		v_correlation_id
		@@ -324,9 +323,9 @@ module AtsCise_TestCases {
		v_pull_request.priority,
		v_pull_request.sender_,
		{},
		-,
		success,
		-,
		-,
		"ContextID",
		v_pull_request.correlationID,
		false

ttcn/LibCise/LibCdm4/http_www_cise_eu_servicemodel_v1_message.ttcn

+7 −7

Original line number	Diff line number	Diff line
		@@ -237,7 +237,7 @@ the message. */
		ReliabilityProfile_1 reliability optional,
		/* Other recipients that also received this message */
		record of Service_1 ccRecipients_list,
		XSD.String elem
		XSD.String elem optional
		}
		with {
		variant "abstract";
		@@ -431,7 +431,7 @@ the message. */
		ReliabilityProfile_1 reliability optional,
		/* Other recipients that also received this message */
		record of Service_1 ccRecipients_list,
		XSD.String elem,
		XSD.String elem optional,
		/* This field is used for the Legacy System to request the CISE Gateway to
		look for services of a specific type and/or from a specific type of
		provider (using the community, country, sea basin...) */
		@@ -499,7 +499,7 @@ the message. */
		ReliabilityProfile_1 reliability optional,
		/* Other recipients that also received this message */
		record of Service_1 ccRecipients_list,
		XSD.String elem,
		XSD.String elem optional,
		/* This field may give a textual description of an error that could have
		happened during the process of the pull request message. This can be used
		to communicate an error that happened after sending the acknowledgement
		@@ -532,7 +532,7 @@ with {
		variant (reliability) "name as capitalized";
		variant (ccRecipients_list) "untagged";
		variant (ccRecipients_list[-]) "name as 'CcRecipients'";
		variant (elem) "anyElement except 'Signature'"/unqualified, 'http://www.cise.eu/servicemodel/v1/message/'"/;
		variant (elem) "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";
		@@ -576,7 +576,7 @@ the message. */
		ReliabilityProfile_1 reliability optional,
		/* Other recipients that also received this message */
		record of Service_1 ccRecipients_list,
		XSD.String elem,
		XSD.String elem optional,
		/* The Pull Type is to distinguish between the simple request and the
		subscription mechanism. It can also be use to unsubscribe to a flow. */
		PullType pullType,
		@@ -614,7 +614,7 @@ with {
		variant (reliability) "name as capitalized";
		variant (ccRecipients_list) "untagged";
		variant (ccRecipients_list[-]) "name as 'CcRecipients'";
		variant (elem) "anyElement except 'Signature'"/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";
		@@ -688,7 +688,7 @@ the message. */
		ReliabilityProfile_1 reliability optional,
		/* Other recipients that also received this message */
		record of Service_1 ccRecipients_list,
		XSD.String elem,
		XSD.String elem optional,
		/* The type of feedback to provide */
		FeedbackType feedbackType,
		/* The description of the reason for feedback. This field is a free text. */

ttcn/LibCise/module.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,6 +3,6 @@ sources := \
		ttcn/LibCise_Pixits.ttcn \
		ttcn/LibCise_Functions.ttcn \
		ttcn/LibCise_Templates.ttcn \
		ttcn/LibCise_TypesAndValues.ttcn \


		# ttcn/LibCise_TypesAndValues.ttcn \
		No newline at end of file