Apply changes from CDM GR 008 (a7b80df8) · Commits · CDM - Common information sharing environment and Data Model / CISE Data Model

ttcn/AtsCise/AtsCise_Templates.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -117,7 +117,7 @@ module AtsCise_Templates {
		in template (omit) XSD.DateTime p_retentionPeriod := omit,
		in template (omit) XSD.Boolean p_ensureEncryption := false,
		in template (omit) Vessel p_vessel := m_vessel(
		-, -, -, -, -, -, -, -, -, -, // TODO Reorganize the template arguments order
		PX_VESSEL_IMO_NUMBER, -, -, -, -, -, -, -, -, -, // TODO Reorganize the template arguments order
		-, // FIXME Initialization of a record of template with an unbound value with { PX_VESSEL_TYPE },
		-, -, -, -, -, -, -, -, -, -, -, -, -, -, -, -, -, -, -, -, -, -, -, -, -, -, -, -, -, -, -,
		PX_VESSEL_NET_TONNAGE

ttcn/AtsCise/AtsCise_TestCases.ttcn

+211 −211

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/LibCise/ttcn/LibCise_Functions.ttcn

+16 −27

Original line number	Diff line number	Diff line
		@@ -139,6 +139,20 @@ module LibCise_Functions {

		} // End of function f_cf_04_down

		function f_cf_05_up() runs on CiseComponent {
		f_cf_01_http_notif_up();
		map(self:utPort, system:utPort);

		f_init_certs_db(PICS_CISE_CERTIFICATES_DB_PATH);
		f_load_certificate(PICS_CISE_TS_CERTIFICATE, PICS_CISE_TS_SIGNING_PRIVATE_KEY, PICS_CISE_TS_SIGNING_PRIVATE_PASSWD);

		} // End of function f_cf_05_up

		function f_cf_05_down() runs on CiseComponent {
		unmap(self:utPort, system:utPort);
		f_cf_01_http_notif_down();
		} // End of function f_cf_05_down

		} // End of group configuration_functions

		group component_functions {
		@@ -1378,23 +1392,11 @@ module LibCise_Functions {
		alt {
		[] utPort.receive(
		mw_http_response(
		mw_http_response_201_created_no_status_text(
		mw_http_message_body_xml
		))) {
		mw_http_response_201_created
		)) {
		tc_ac.stop;
		log("f_ut_trigger: INFO: UtTrigger response received");
		}
		[] utPort.receive(
		mw_http_response(
		mw_http_response_ko(
		mw_http_message_body_json(
		mw_body_json_problem_details(
		mw_problem_details
		))))) {
		tc_ac.stop;
		log("f_ut_trigger: FAIL: UtTrigger error response received");
		v_result := false;
		}
		[] utPort.receive {
		tc_ac.stop;
		log("f_ut_trigger: FAIL: UtTrigger any response received");
		@@ -1405,19 +1407,6 @@ module LibCise_Functions {
		v_result := false;
		}
		} // End of 'alt' statement
		f_init_default_headers_list("application/json", -, v_headers);
		f_set_headers_list(v_headers_to_set, v_headers_value, v_headers);
		utPort.send(
		m_http_request(
		m_http_request_post(
		PICS_ROOT_API & PICS_CISE_ADAPTOR_URI & "/send",
		v_headers,
		m_http_message_body_json(
		m_json_body_ut_trigger(
		p_ut_trigger.desc

		)))));
		// Do not wait for the response here because it will arrived after the TS reply the requested message

		return v_result;
		} // End of function f_ut_trigger

ttcn/LibCise/ttcn/LibCise_Pics.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -135,7 +135,7 @@ module LibCise_Pics {

		modulepar charstring PICS_FEEDBACK_URI := "api/feedback";

		modulepar charstring PICS_CISE_ADAPTOR_URI := "/api/v1/messages";
		modulepar charstring PICS_CISE_ADAPTOR_URI := "api/v1/messages";

		/**
		* @desc Certificate storage path

ttcn/LibCise/ttcn/LibCise_TestSystem.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@ module LibCise_TestSystem {
		} // End of component CiseMtc

		type component CiseComponent extends HttpComponent, SelfSyncComp {
		port HttpPort utPort; // FIXME Not used?
		port HttpPort utPort;
		} // End of component CiseComponent

		type component CiseTestAdapter extends HttpTestAdapter {