diff --git a/ttcn/AtsMec/AtsMec_AppLCM_TestCases.ttcn b/ttcn/AtsMec/AtsMec_AppLCM_TestCases.ttcn index 0e1b21f0c4a92695d4880c90c1f8b13c980d9e00..807046cad65162fa498dcbea99cf1d3e55ab6061 100644 --- a/ttcn/AtsMec/AtsMec_AppLCM_TestCases.ttcn +++ b/ttcn/AtsMec/AtsMec_AppLCM_TestCases.ttcn @@ -1576,7 +1576,7 @@ group app_lcm__notification { [] httpPort_notif.receive( mw_http_request( mw_http_request_post( - unichar2char(PX_CALLBACK_URI), + oct2char(unichar2oct(PX_CALLBACK_URI)), -, mw_http_message_body_json( mw_body_json_lcm_notification( diff --git a/ttcn/AtsMec/AtsMec_FixedAccessInfoAPI_TestCases.ttcn b/ttcn/AtsMec/AtsMec_FixedAccessInfoAPI_TestCases.ttcn index 375d8c129ff8963684eb75a0817ee10a67a69273..486cc6c74bbd6eeb9132f6c0b6042373aff1e9f0 100644 --- a/ttcn/AtsMec/AtsMec_FixedAccessInfoAPI_TestCases.ttcn +++ b/ttcn/AtsMec/AtsMec_FixedAccessInfoAPI_TestCases.ttcn @@ -23,118 +23,113 @@ module AtsMec_FixedAccessInformationAPI_TestCases { import from LibItsHttp_JsonTemplates all; import from LibItsHttp_TestSystem all; - // LibMec_LocationAPI - import from LocationAPI_TypesAndValues all; - import from LocationAPI_Templates all; - import from LocationAPI_Pics all; - import from LocationAPI_Pixits all; + // LibMec_FixedAccessInformationServiceAPI + import from FixedAccessInformationServiceAPI_Templates all; + import from FixedAccessInformationServiceAPI_Pics all; + import from FixedAccessInformationServiceAPI_Pixits all; // LibMec import from LibMec_Functions all; import from LibMec_Pics all; import from LibMec_Pixits all; - /* * Fixed Access Information Service (FAIS) */ - - group fixedAccessInfoService { + group fixedAccessInfoService { /** * @desc Check that the IUT responds with the current status of the fixed access information when queried by a MEC Application */ testcase TP_MEC_SRV_FAIS_001_OK() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + + // Test component configuration + f_cf_01_http_up(); + + // Test adapter configuration + + // Preamble + f_init_default_headers_list(-, -, v_headers); + httpPort.send( + m_http_request( + m_http_request_get( + "/" & PICS_ROOT_API & PX_FAI_FA_INFO_URI, + v_headers + ) + ) + ); + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + + // Test Body + tc_ac.start; + alt { + [] httpPort.receive( + mw_http_response( + mw_http_response_ok( + mw_http_message_body_json( + mw_body_json_fai_fa_info( + mw_fa_info + ))))) { + tc_ac.stop; + + log("*** " & testcasename() & ": PASS: IUT successfully responds with a FaInfo ***"); + f_selfOrClientSyncAndVerdict(c_tbDone, e_success); } - - // Test component configuration - f_cf_01_http_up(); - - // Test adapter configuration - - // Preamble - f_init_default_headers_list(-, -, v_headers); - httpPort.send( - m_http_request( - m_http_request_get( - PX_FAI_FA_INFO_URI, - v_headers - ) - ) - ); - f_selfOrClientSyncAndVerdict(c_prDone, e_success); - - // Test Body - tc_ac.start; - alt { - [] httpPort.receive( - mw_http_response( - mw_http_response_ok( - mw_http_message_body_json( - mw_body_json_fai_fa_info( - mw_fai_fa_info(?) - )))) { - tc_ac.stop; - - log("*** " & testcasename() & ": PASS: IUT successfully responds with a FaInfo ***"); - f_selfOrClientSyncAndVerdict(c_tbDone, e_success); - } - [] tc_ac.timeout { - log("*** " & testcasename() & ": INCONC: Expected message not received ***"); - f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); - } - } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + [] tc_ac.timeout { + log("*** " & testcasename() & ": INCONC: Expected message not received ***"); + f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); + } + } // End of 'alt' statement + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_001_OK /** * @desc Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application */ testcase TP_MEC_SRV_FAIS_001_BR() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } - - // Test component configuration - f_cf_01_http_up(); - - // Test adapter configuration - - // Preamble - f_init_default_headers_list(-, -, v_headers); - httpPort.send( - m_http_request( - m_http_request_get( - PX_FAI_FA_INFO_URI & "?interface=1", - v_headers - ) - ) - ); - f_selfOrClientSyncAndVerdict(c_prDone, e_success); - - // Test Body - tc_ac.start; - alt { - [] httpPort.receive( - mw_http_response( + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + + // Test component configuration + f_cf_01_http_up(); + + // Test adapter configuration + + // Preamble + f_init_default_headers_list(-, -, v_headers); + httpPort.send( + m_http_request( + m_http_request_get( + "/" & PICS_ROOT_API & PX_FAI_FA_INFO_URI & "?interface=1", + v_headers + ) + ) + ); + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + + // Test Body + tc_ac.start; + alt { + [] httpPort.receive( + mw_http_response( mw_http_response_400_bad_request )) { tc_ac.stop; @@ -146,10 +141,10 @@ module AtsMec_FixedAccessInformationAPI_TestCases { log("*** " & testcasename() & ": INCONC: Expected message not received ***"); f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } - } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + } // End of 'alt' statement + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_001_BR /** @@ -160,15 +155,15 @@ module AtsMec_FixedAccessInformationAPI_TestCases { var HeaderLines v_headers; // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); setverdict(inconc); stop; } // Test component configuration f_cf_01_http_up(); - + // Test adapter configuration // Preamble @@ -176,7 +171,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - PX_FAI_FA_INFO_URI & "?interface=999", + "/" & PICS_ROOT_API & PX_FAI_FA_INFO_URI & "?interface=999", v_headers ) ) @@ -200,7 +195,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - + // Postamble f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_001_NF @@ -209,17 +204,16 @@ module AtsMec_FixedAccessInformationAPI_TestCases { * @desc Check that the IUT responds with the current status of the device information when queried by a MEC Application */ testcase TP_MEC_SRV_FAIS_002_OK() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } - + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -230,7 +224,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - PX_FAI_DEVICE_INFO_URI, + "/" & PICS_ROOT_API & PX_FAI_DEVICE_INFO_URI, v_headers ) ) @@ -240,16 +234,16 @@ module AtsMec_FixedAccessInformationAPI_TestCases { // Test Body tc_ac.start; alt { - [] httpPort.receive( - mw_http_response( - mw_http_response_ok( - mw_http_message_body_json( - mw_body_json_fai_device_info( - mw_fai_device_info(?) - )))) { - tc_ac.stop; - - log("*** " & testcasename() & ": PASS: IUT successfully responds with a DeviceInfo ***"); + [] httpPort.receive( + mw_http_response( + mw_http_response_ok( + mw_http_message_body_json( + mw_body_json_fai_device_info( + mw_device_info + ))))) { + tc_ac.stop; + + log("*** " & testcasename() & ": PASS: IUT successfully responds with a DeviceInfo ***"); f_selfOrClientSyncAndVerdict(c_tbDone, e_success); } [] tc_ac.timeout { @@ -257,26 +251,25 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_002_OK /** * @desc Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application */ testcase TP_MEC_SRV_FAIS_002_BR() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } - + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -287,7 +280,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - PX_FAI_DEVICE_INFO_URI & "?device=__any_value__", + "/" & PICS_ROOT_API & PX_FAI_DEVICE_INFO_URI & "?device=__any_value__", v_headers ) ) @@ -299,8 +292,8 @@ module AtsMec_FixedAccessInformationAPI_TestCases { alt { [] httpPort.receive( mw_http_response( - mw_http_response_400_bad_request() - )) { + mw_http_response_400_bad_request + )) { tc_ac.stop; @@ -312,9 +305,9 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_002_BR /** @@ -323,14 +316,14 @@ module AtsMec_FixedAccessInformationAPI_TestCases { testcase TP_MEC_SRV_FAIS_002_NF() runs on HttpComponent system HttpTestAdapter { // Local variables var HeaderLines v_headers; - + // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); setverdict(inconc); stop; } - + // Test component configuration f_cf_01_http_up(); @@ -341,7 +334,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - PX_FAI_DEVICE_INFO_URI & "?gwId=" & oct2char(unichar2oct(PX_NON_EXISTING_FAI_GW_ID, "UTF-8")), + "/" & PICS_ROOT_API & PX_FAI_DEVICE_INFO_URI & "?gwId=" & oct2char(unichar2oct(PX_NON_EXISTING_FAI_GW_ID[0], "UTF-8")), v_headers ) ) @@ -353,7 +346,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases { alt { [] httpPort.receive( mw_http_response( - mw_http_response_404_not_found() + mw_http_response_404_not_found )) { tc_ac.stop; @@ -374,17 +367,16 @@ module AtsMec_FixedAccessInformationAPI_TestCases { * @desc CCheck that the IUT responds with the current status of the cable line information when queried by a MEC Application */ testcase TP_MEC_SRV_FAIS_003_OK() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } - + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -395,9 +387,9 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - PX_FAI_CABLE_LINE_INFO_URI - v_headers, - ) + "/" & PICS_ROOT_API & PX_FAI_CABLE_LINE_INFO_URI, + v_headers + ) ) ); f_selfOrClientSyncAndVerdict(c_prDone, e_success); @@ -410,8 +402,8 @@ module AtsMec_FixedAccessInformationAPI_TestCases { mw_http_response_ok( mw_http_message_body_json( mw_body_json_fai_cable_line_info( - mw_fai_cable_line_info(?) - )))) { + mw_cable_line_info + ))))) { tc_ac.stop; @@ -423,26 +415,25 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_003_OK /** * @desc Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application */ testcase TP_MEC_SRV_FAIS_003_BR() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } - + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -453,7 +444,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - PX_FAI_CABLE_LINE_INFO_URI & "?cm=__any_value__", + "/" & PICS_ROOT_API & PX_FAI_CABLE_LINE_INFO_URI & "?cm=__any_value__", v_headers ) ) @@ -465,8 +456,8 @@ module AtsMec_FixedAccessInformationAPI_TestCases { alt { [] httpPort.receive( mw_http_response( - mw_http_response_400_bad_request() - )) { + mw_http_response_400_bad_request + )) { tc_ac.stop; @@ -478,26 +469,25 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_003_BR /** * @desc Check that the IUT responds with an error when a request for an URI that cannot be mapped to a valid resource URI is sent by a MEC Application */ testcase TP_MEC_SRV_FAIS_003_NF() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } - + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -508,7 +498,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - PX_FAI_CABLE_LINE_INFO_URI & "?cmId=" & oct2char(unichar2oct(PX_NON_EXISTING_FAI_CM_ID, "UTF-8")), + "/" & PICS_ROOT_API & PX_FAI_CABLE_LINE_INFO_URI & "?cmId=" & oct2char(unichar2oct(PX_NON_EXISTING_FAI_CM_ID, "UTF-8")), v_headers ) ) @@ -520,7 +510,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases { alt { [] httpPort.receive( mw_http_response( - mw_http_response_404_not_found() + mw_http_response_404_not_found )) { tc_ac.stop; @@ -532,26 +522,25 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_003_NF /** * @desc Check that the IUT responds with the current status of the optical network information when queried by a MEC Application */ testcase TP_MEC_SRV_FAIS_004_OK() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } - + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -562,7 +551,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - PX_FAI_OPTICAL_NW_INFO_URI + "/" & PICS_ROOT_API & PX_FAI_OPTICAL_NW_INFO_URI, v_headers ) ) @@ -574,13 +563,11 @@ module AtsMec_FixedAccessInformationAPI_TestCases { alt { [] httpPort.receive( mw_http_response( - mw_http_response_200_ok( + mw_http_response_ok( mw_http_message_body_json( - mw_body_json_fai_pon_info( - mw_fai_pon_info(?) - ) - )))) { - + mw_body_json_fai_pon_info( + mw_pon_info + ))))) { tc_ac.stop; log("*** " & testcasename() & ": PASS: IUT successfully responds with a PonInfo ***"); @@ -591,26 +578,25 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_004_OK /** * @desc Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application */ testcase TP_MEC_SRV_FAIS_004_BR() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } + // Local variables + var HeaderLines v_headers; + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -621,7 +607,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - PX_FAI_OPTICAL_NW_INFO_URI & "?onu=__any_value__" + "/" & PICS_ROOT_API & PX_FAI_OPTICAL_NW_INFO_URI & "?onu=__any_value__", v_headers ) ) @@ -633,8 +619,8 @@ module AtsMec_FixedAccessInformationAPI_TestCases { alt { [] httpPort.receive( mw_http_response( - mw_http_response_400_bad_request() - )) { + mw_http_response_400_bad_request + )) { tc_ac.stop; @@ -646,26 +632,25 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_004_BR /** * @desc Check that the IUT responds with an error when a request for an URI that cannot be mapped to a valid resource URI is sent by a MEC Application */ testcase TP_MEC_SRV_FAIS_004_NF() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } + // Local variables + var HeaderLines v_headers; + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -675,10 +660,10 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_init_default_headers_list(-, -, v_headers); httpPort.send( m_http_request( - m_http_request_get( - PX_FAI_OPTICAL_NW_INFO_URI & "?onuId=" & oct2char(unichar2oct(PX_NON_EXISTING_FAI_ONU_ID, "UTF-8")) - v_headers - ) + m_http_request_get( + "/" & PICS_ROOT_API & PX_FAI_OPTICAL_NW_INFO_URI & "?onuId=" & oct2char(unichar2oct(PX_NON_EXISTING_FAI_ONU_ID, "UTF-8")), + v_headers + ) ) ); f_selfOrClientSyncAndVerdict(c_prDone, e_success); @@ -700,26 +685,25 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_004_NF /** * @desc Check that the IUT responds with the information pertaining to one or more UEs in a particular location when queried by a MEC Application */ testcase TP_MEC_SRV_FAIS_005_OK() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } - + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -730,7 +714,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - PX_FAI_SUB_URI + "/" & PICS_ROOT_API & PX_FAI_SUB_URI, v_headers ) ) @@ -742,13 +726,11 @@ module AtsMec_FixedAccessInformationAPI_TestCases { alt { [] httpPort.receive( mw_http_response( - mw_http_response_200_ok( + mw_http_response_ok( mw_http_message_body_json( - mw_body_json_subscription_link_list( - mw_subscription_link_list(?) - ) - )))) { - + mw_body_json_fai_subscription_link_list( + mw_subscription_link_list + ))))) { tc_ac.stop; log("*** " & testcasename() & ": PASS: IUT successfully responds with a SubscriptionLinkList ***"); @@ -759,26 +741,25 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_005_OK /** * @desc Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application */ testcase TP_MEC_SRV_FAIS_005_BR() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } - + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -789,7 +770,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - PX_FAI_SUB_URI & "?subscription=__any_value" + "/" & PICS_ROOT_API & PX_FAI_SUB_URI & "?subscription=__any_value", v_headers ) ) @@ -801,9 +782,8 @@ module AtsMec_FixedAccessInformationAPI_TestCases { alt { [] httpPort.receive( mw_http_response( - mw_http_response_400_bad_request() - )) { - + mw_http_response_400_bad_request + )) { tc_ac.stop; log("*** " & testcasename() & ": PASS: IUT successfully responds with a 400 Bad Request ***"); @@ -814,26 +794,25 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_005_BR /** * @desc Check that the IUT responds with an error when a request for an unknown URI is sent by a MEC Application */ testcase TP_MEC_SRV_FAIS_005_NF() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } - + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -844,7 +823,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - PX_FAI_SUB_URI & "?subscription_type=" & oct2char(unichar2oct(PX_NON_EXISTING_FAI_SUB_ID, "UTF-8")) + "/" & PICS_ROOT_API & PX_FAI_SUB_URI & "?subscription_type=" & oct2char(unichar2oct(PX_NON_EXISTING_FAI_SUB_ID, "UTF-8")), v_headers ) ) @@ -856,8 +835,8 @@ module AtsMec_FixedAccessInformationAPI_TestCases { alt { [] httpPort.receive( mw_http_response( - mw_http_response_404_not_found() - )) { + mw_http_response_404_not_found + )) { tc_ac.stop; @@ -869,26 +848,25 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_UEINFOLOOK_001_NF /** * @desc Check that the IUT acknowledges the subscription by a MEC Application to notifications on Optical Network Unit alarm events */ testcase TP_MEC_SRV_FAIS_006_OK() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } - + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -899,15 +877,15 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_post( - PX_FAI_SUB_URI, + "/" & PICS_ROOT_API & PX_FAI_SUB_URI, v_headers, m_http_message_body_json( - m_body_json_onu_alarm_subscription( - m_onu_alarm_subscription( - "OnuAlarmSubscription", // subscriptionType - PX_ONU_ALARM_SUB_CALLBACK_URI // callbackReference - ) - ) + m_body_json_fai_onu_alarm_subscription_link_list( + m_onu_alarm_subscription( + PX_ONU_ALARM_SUB_CALLBACK_URI, // callbackReference + m_filter_criteria_onu_alarm + ) + ) ) ) ) @@ -920,13 +898,11 @@ module AtsMec_FixedAccessInformationAPI_TestCases { [] httpPort.receive( mw_http_response( mw_http_response_201_created( - mw_http_message_body_json( - mw_body_json_onu_alarm_subscription( - mw_onu_alarm_subscription( - "OnuAlarmSubscription" // subscriptionType - ) - ) - )))) { + mw_http_message_body_json( + mw_body_json_fai_onu_alarm_subscription_link_list( + mw_onu_alarm_subscription( + PX_ONU_ALARM_SUB_CALLBACK_URI + )))))) { // TODO how to send this? The TP has the IUT doing this immediately. Do we want this or will it be discarded as part of the test? // MEC 029, clause 7.7.3.4 // the IUT entity sends a vPOST containing @@ -938,7 +914,6 @@ module AtsMec_FixedAccessInformationAPI_TestCases { // ; // ; // to the MEC_APP entity - tc_ac.stop; log("*** " & testcasename() & ": PASS: IUT successfully responds with a OnuAlarmSubscription ***"); @@ -949,26 +924,25 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_006_OK /** * @desc Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application */ testcase TP_MEC_SRV_FAIS_006_BR() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } - + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -979,15 +953,15 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_post( - PX_UE_ZONAL_TRAF_SUB_URI, + "/" & PICS_ROOT_API & PX_UE_ZONAL_TRAF_SUB_URI, v_headers, m_http_message_body_json( - m_body_json_onu_alarm_subscription( - m_onu_alarm_subscription( - "UNKNOWN_SUSCRIPTION", // subscriptionType - PX_ONU_ALARM_SUB_CALLBACK_URI // callbackReference - ) - ) + m_body_json_fai_onu_alarm_subscription_link_list( + m_onu_alarm_subscription_bad_request( + PX_ONU_ALARM_SUB_CALLBACK_URI, // callbackReference + m_filter_criteria_onu_alarm + ) + ) ) ) ) @@ -999,9 +973,8 @@ module AtsMec_FixedAccessInformationAPI_TestCases { alt { [] httpPort.receive( mw_http_response( - mw_http_response_400_bad_request() - )) { - + mw_http_response_400_bad_request + )) { tc_ac.stop; log("*** " & testcasename() & ": PASS: IUT successfully responds with 400 Bad Request ***"); @@ -1012,26 +985,25 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_006_BR /** * @desc Check that the IUT responds with the information on a given subscription when queried by a MEC Application */ testcase TP_MEC_SRV_FAIS_007_OK() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } - + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -1042,7 +1014,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - PX_FAI_SUB_URI & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")) + "/" & PICS_ROOT_API & PX_FAI_SUB_URI & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")), v_headers ) ) @@ -1054,15 +1026,11 @@ module AtsMec_FixedAccessInformationAPI_TestCases { alt { [] httpPort.receive( mw_http_response( - mw_http_response_200_ok( + mw_http_response_ok( mw_http_message_body_json( - mw_body_json_onu_alarm_subscription( - mw_onu_alarm_subscription( - "OnuAlarmSubscription" // subscriptionType - ) - ) - )))) { - + mw_body_json_fai_onu_alarm_subscription_link_list( + mw_onu_alarm_subscription + ))))) { tc_ac.stop; log("*** " & testcasename() & ": PASS: IUT successfully responds with a OnuAlarmSubscription ***"); @@ -1073,26 +1041,25 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_007_OK /** * @desc Check that the IUT responds with an error when a request for an unknown URI is sent by a MEC Application */ testcase TP_MEC_SRV_FAIS_007_NF() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } - + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -1103,7 +1070,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - PX_FAI_SUB_URI & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")) + "/" & PICS_ROOT_API & PX_FAI_SUB_URI & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")), v_headers ) ) @@ -1115,9 +1082,8 @@ module AtsMec_FixedAccessInformationAPI_TestCases { alt { [] httpPort.receive( mw_http_response( - mw_http_response_404_not_found() - )) { - + mw_http_response_404_not_found + )) { tc_ac.stop; log("*** " & testcasename() & ": PASS: IUT successfully responds with a 404 Not Found ***"); @@ -1129,25 +1095,24 @@ module AtsMec_FixedAccessInformationAPI_TestCases { } } // End of 'alt' statement - // Postamble - f_cf_01_http_down(); + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_007_NF /** * @desc Check that the IUT updates an existing subscription when commanded by a MEC Application */ testcase TP_MEC_SRV_FAIS_008_OK() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } - + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -1159,14 +1124,15 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_put( - PX_FAI_SUB_URI & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")), + "/" & PICS_ROOT_API & PX_FAI_SUB_URI & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")), v_headers, m_http_message_body_json( - m_body_json_onu_alarm_subscription( - m_onu_alarm_subscription( - "OnuAlarmSubscription" // subscriptionType - ) - ) + m_body_json_fai_onu_alarm_subscription_link_list( + m_onu_alarm_subscription( + PX_ONU_ALARM_SUB_CALLBACK_URI, + m_filter_criteria_onu_alarm + ) + ) ) ) ) @@ -1180,12 +1146,9 @@ module AtsMec_FixedAccessInformationAPI_TestCases { mw_http_response( mw_http_response_ok( mw_http_message_body_json( - mw_body_json_onu_alarm_subscription( - mw_onu_alarm_subscription( - "OnuAlarmSubscription" // subscriptionType - ) - ) - )))) { + mw_body_json_fai_onu_alarm_subscription_link_list( + mw_onu_alarm_subscription + ))))) { tc_ac.stop; log("*** " & testcasename() & ": PASS: IUT successfully responds with a userTrackingSubscription ***"); @@ -1196,26 +1159,25 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_008_OK /** * @desc Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application */ testcase TP_MEC_SRV_FAIS_008_BR() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } - + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -1227,16 +1189,15 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_put( - PX_FAI_SUB_URI & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")), + "/" & PICS_ROOT_API & PX_FAI_SUB_URI & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")), v_headers, m_http_message_body_json( - m_body_json_onu_alarm_subscription( - m_onu_alarm_subscription( - // TODO the TP uses a wrong field name to trigger an error response. Do we create a new data structure just for this or - // change the test to use another trigger? - "OnuAlarmSubscription" // subscriptionType - ) - ) + m_body_json_fai_onu_alarm_subscription_link_list( + m_onu_alarm_subscription_bad_request( + PX_ONU_ALARM_SUB_CALLBACK_URI, + m_filter_criteria_onu_alarm + ) + ) ) ) ) @@ -1248,9 +1209,8 @@ module AtsMec_FixedAccessInformationAPI_TestCases { alt { [] httpPort.receive( mw_http_response( - mw_http_response_400_bad_request() - )) { - + mw_http_response_400_bad_request + )) { tc_ac.stop; log("*** " & testcasename() & ": PASS: IUT successfully responds with 400 Bad Request ***"); @@ -1261,26 +1221,25 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_008_BR /** * @desc Check that the IUT responds with an error when a request for an unknown URI is sent by a MEC Application */ testcase TP_MEC_SRV_FAIS_008_NF() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } - + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -1292,14 +1251,15 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_put( - PX_FAI_SUB_URI & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")), + "/" & PICS_ROOT_API & PX_FAI_SUB_URI & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")), v_headers, m_http_message_body_json( - m_body_json_onu_alarm_subscription( - m_onu_alarm_subscription( - "OnuAlarmSubscription" // subscriptionType - ) - ) + m_body_json_fai_onu_alarm_subscription_link_list( + m_onu_alarm_subscription( + PX_ONU_ALARM_SUB_CALLBACK_URI, + m_filter_criteria_onu_alarm + ) + ) ) ) ) @@ -1311,17 +1271,11 @@ module AtsMec_FixedAccessInformationAPI_TestCases { alt { [] httpPort.receive( mw_http_response( - mw_http_response_ok( - mw_http_message_body_json( - mw_body_json_onu_alarm_subscription( - mw_onu_alarm_subscription( - "OnuAlarmSubscription" // subscriptionType - ) - ) - )))) { + mw_http_response_404_not_found + )) { tc_ac.stop; - log("*** " & testcasename() & ": PASS: IUT successfully responds with a userTrackingSubscription ***"); + log("*** " & testcasename() & ": PASS: IUT successfully responds with a HTTP error 404 ***"); f_selfOrClientSyncAndVerdict(c_tbDone, e_success); } [] tc_ac.timeout { @@ -1329,26 +1283,25 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_008_NF /** * @desc Check that the IUT responds with an error when a request sent by a MEC Application doesn't comply with a required condition */ testcase TP_MEC_SRV_FAIS_008_PF() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } - + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -1360,14 +1313,15 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_put( - PX_FAI_SUB_URI & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")), + "/" & PICS_ROOT_API & PX_FAI_SUB_URI & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")), v_headers, m_http_message_body_json( - m_body_json_onu_alarm_subscription( - m_onu_alarm_subscription( - "OnuAlarmSubscription" // subscriptionType - ) - ) + m_body_json_fai_onu_alarm_subscription_link_list( + m_onu_alarm_subscription( + PX_ONU_ALARM_SUB_CALLBACK_URI, + m_filter_criteria_onu_alarm + ) + ) ) ) ) @@ -1379,17 +1333,11 @@ module AtsMec_FixedAccessInformationAPI_TestCases { alt { [] httpPort.receive( mw_http_response( - mw_http_response_ok( - mw_http_message_body_json( - mw_body_json_onu_alarm_subscription( - mw_onu_alarm_subscription( - "OnuAlarmSubscription" // subscriptionType - ) - ) - )))) { + mw_http_response_412_precondition_failed + )) { tc_ac.stop; - - log("*** " & testcasename() & ": PASS: IUT successfully responds with a userTrackingSubscription ***"); + + log("*** " & testcasename() & ": PASS: IUT successfully responds with a ProblemDetails set to 412 Precondition Failed ***"); f_selfOrClientSyncAndVerdict(c_tbDone, e_success); } [] tc_ac.timeout { @@ -1397,26 +1345,25 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_008_PF /** * @desc Check that the IUT acknowledges the cancellation of UE location change notifications when commanded by a MEC Application */ testcase TP_MEC_SRV_FAIS_009_OK() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } - + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -1427,9 +1374,9 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_delete( - PX_FAI_SUB_URI & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")), - v_headers, - ) + "/" & PICS_ROOT_API & PX_FAI_SUB_URI & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")), + v_headers + ) ) ); f_selfOrClientSyncAndVerdict(c_prDone, e_success); @@ -1439,9 +1386,8 @@ module AtsMec_FixedAccessInformationAPI_TestCases { alt { [] httpPort.receive( mw_http_response( - mw_http_response_204_no_content() - )) { - + mw_http_response_204_no_content + )) { tc_ac.stop; log("*** " & testcasename() & ": PASS: IUT successfully responds with no content ***"); @@ -1452,26 +1398,25 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_009_OK /** * @desc Check that the IUT responds with an error when a request for an URI that cannot be mapped to a valid resource URI is sent by a MEC Application */ testcase TP_MEC_SRV_FAIS_009_NF() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } + // Local variables + var HeaderLines v_headers; + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -1482,9 +1427,9 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_delete( - PX_FAI_SUB_URI & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")), - v_headers, - ) + "/" & PICS_ROOT_API & PX_FAI_SUB_URI & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")), + v_headers + ) ) ); f_selfOrClientSyncAndVerdict(c_prDone, e_success); @@ -1494,9 +1439,8 @@ module AtsMec_FixedAccessInformationAPI_TestCases { alt { [] httpPort.receive( mw_http_response( - mw_http_response_404_not_found() - )) { - + mw_http_response_404_not_found + )) { tc_ac.stop; log("*** " & testcasename() & ": PASS: IUT successfully responds with no 404 Not Found ***"); @@ -1507,26 +1451,25 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_009_NF /** * @desc Check that the IUT sends notification on expiry of Fixed Access Information event subscription to a MEC Application */ testcase TP_MEC_SRV_FAIS_010_OK() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } - + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -1537,17 +1480,17 @@ module AtsMec_FixedAccessInformationAPI_TestCases { httpPort.send( m_http_request( m_http_request_post( - PX_FAI_SUB_URI, + "/" & PICS_ROOT_API & PX_FAI_SUB_URI, v_headers, m_http_message_body_json( - m_body_json_onu_alarm_subscription( - m_onu_alarm_subscription( - "DevInfoSubscription", // subscriptionType - PX_ONU_ALARM_SUB_CALLBACK_URI, // callbackReference - // TODO: how to set this? - PX_NOW_PLUS_X_SECONDS // expiryDeadline - ) - ) + m_body_json_fai_onu_alarm_subscription_link_list( + m_onu_alarm_subscription( + PX_ONU_ALARM_SUB_CALLBACK_URI, + m_filter_criteria_onu_alarm, + -, + m_time_stamp(1577836800) + ) + ) ) ) ) @@ -1561,12 +1504,9 @@ module AtsMec_FixedAccessInformationAPI_TestCases { mw_http_response( mw_http_response_201_created( mw_http_message_body_json( - mw_body_json_dev_info_subscription( - mw_dev_info_subscription( - "DevInfoSubscription", // subscriptionType - ) - ) - )))) { + mw_body_json_fai_onu_alarm_subscription_link_list( + mw_onu_alarm_subscription + ))))) { // TODO Need to check Location header // TODO: how to wait for a timeout of (NOW_PLUS_X_SECONDS - guard time)? which guard time value to use? @@ -1580,7 +1520,6 @@ module AtsMec_FixedAccessInformationAPI_TestCases { // ; // ; // to the MEC_APP entity - tc_ac.stop; log("*** " & testcasename() & ": PASS: IUT successfully responds with a DevInfoSubscription ***"); @@ -1591,26 +1530,25 @@ module AtsMec_FixedAccessInformationAPI_TestCases { f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); } } // End of 'alt' statement - - // Postamble - f_cf_01_http_down(); + + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_010_OK /** * @desc Check that the IUT acknowledges the subscription by a MEC Application to notifications on Optical Network Unit alarm events */ testcase TP_MEC_SRV_FAIS_011_OK() runs on HttpComponent system HttpTestAdapter { - // Local variables - var HeaderLines v_headers; - var HttpMessage v_response; - - // Test control - if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { - log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); - setverdict(inconc); - stop; - } - + // Local variables + var HeaderLines v_headers; + + // Test control + if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) { + log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_FAI_API_SUPPORTED required for executing the TC ***"); + setverdict(inconc); + stop; + } + // Test component configuration f_cf_01_http_up(); @@ -1648,8 +1586,11 @@ module AtsMec_FixedAccessInformationAPI_TestCases { // } // } - // Postamble - f_cf_01_http_down(); + // Postamble + f_cf_01_http_down(); } // End of testcase TP_MEC_SRV_FAIS_011_OK + } // End of group fixedAccessInfoService + } // End of module AtsMec_FixedAccessInfoAPI_TestCases + diff --git a/ttcn/AtsMec/AtsMec_MeoPkgm_TestCases.ttcn b/ttcn/AtsMec/AtsMec_MeoPkgm_TestCases.ttcn index 43cf6c46d6b7f4fcb1761783a72fc7cf89d725a8..7dc9fe84dc04b3c7026015c74bb7586c3cafdd85 100644 --- a/ttcn/AtsMec/AtsMec_MeoPkgm_TestCases.ttcn +++ b/ttcn/AtsMec/AtsMec_MeoPkgm_TestCases.ttcn @@ -1213,7 +1213,7 @@ group pkg_management_notification { [] httpPort_notif.receive( mw_http_request( mw_http_request_post( - unichar2char(PX_CALLBACK_URI), + oct2char(unichar2oct(PX_CALLBACK_URI)), -, mw_http_message_body_json( mw_body_json_app_package_notification( diff --git a/ttcn/AtsMec/AtsMec_MepmPkgm_TestCases.ttcn b/ttcn/AtsMec/AtsMec_MepmPkgm_TestCases.ttcn index 30e28090c8ef24464a865dffded71e539a26b9ca..654fd9d23260c1925912365e919574bca88d6baf 100644 --- a/ttcn/AtsMec/AtsMec_MepmPkgm_TestCases.ttcn +++ b/ttcn/AtsMec/AtsMec_MepmPkgm_TestCases.ttcn @@ -73,18 +73,18 @@ module AtsMec_PkgMgmt_mm3_TestCases { mw_http_response_ok( mw_http_message_body_json( mw_body_json_mepm_pkg_mgmt_response_list( - { - *, - mw_package_management( - PX_ON_BOARDED_APP_PKG_ID, - PX_APP_D_ID, - -, - -, - -, - - - ), - * - } + { + *, + mw_package_management( + PX_ON_BOARDED_APP_PKG_ID, + PX_APP_D_ID, + -, + -, + -, + - + ), + * + } ))))) -> value v_response { tc_ac.stop; log("*** " & testcasename() & ": PASS: IUT successfully responds with a Onboarded App Package list***"); @@ -153,7 +153,7 @@ module AtsMec_PkgMgmt_mm3_TestCases { /** * @desc: Check that MEPM returns the an App Package when requested * ETSI GS MEC 010-2 2.0.10, clause 7.4.2.3.2 - * ETSI GS MEC 010-2 2.0.10, Table 6.2.3.3.2-1 //OnboardedAppPkgInfo + * ETSI GS MEC 010-2 2.0.10, Table 6.2.3.3.2-1 //OnboardedAppPkgInfo */ testcase TP_MEC_MEPM_PKGM_002_OK() runs on HttpComponent system HttpTestAdapter { // Local variables @@ -185,16 +185,16 @@ module AtsMec_PkgMgmt_mm3_TestCases { alt { [] httpPort.receive( mw_http_response( - mw_http_response_ok( - mw_http_message_body_json( + mw_http_response_ok( + mw_http_message_body_json( mw_body_json_mepm_pkg_mgmt_response( - mw_package_management( - PX_ON_BOARDED_APP_PKG_ID, - -, -, -, -, -, - - ) - ) - ) - ) + mw_package_management( + PX_ON_BOARDED_APP_PKG_ID, + -, -, -, -, -, - + ) + ) + ) + ) )) -> value v_response { tc_ac.stop; log("*** " & testcasename() & ": PASS: IUT successfully responds with an Onboarded App Package info and 200 status code ***"); @@ -210,7 +210,7 @@ module AtsMec_PkgMgmt_mm3_TestCases { /** * @desc: Check that MEPM responds with an error when it receives - * a request for returning a App Package referred with a wrong ID + * a request for returning a App Package referred with a wrong ID * @see: ETSI GS MEC 010-2 2.0.10, clause 7.4.2.3.2 */ testcase TP_MEC_MEPM_PKGM_002_NF() runs on HttpComponent system HttpTestAdapter { @@ -295,7 +295,7 @@ module AtsMec_PkgMgmt_mm3_TestCases { mw_http_response( mw_http_response_ok( //@TODO: How to check if a file is present in the body? - ))) -> value v_response { + ))) -> value v_response { tc_ac.stop; log("*** " & testcasename() & ": PASS: IUT successfully responds with the app descriptor contained in the app pkg ***"); f_selfOrClientSyncAndVerdict(c_tbDone, e_success); @@ -308,9 +308,9 @@ module AtsMec_PkgMgmt_mm3_TestCases { } // End of testcase TP_MEC_MEPM_PKGM_003_OK - /** + /** * @desc: Check that MEPM responds with an error when it receives - * a request for returning a App Descriptor referred with a wrong App Package ID + * a request for returning a App Descriptor referred with a wrong App Package ID * @see: ETSI GS MEC 010-2 2.0.10, clause 7.4.4.3.2 */ testcase TP_MEC_MEPM_PKGM_003_NF() runs on HttpComponent system HttpTestAdapter { @@ -394,7 +394,7 @@ module AtsMec_PkgMgmt_mm3_TestCases { mw_http_response( mw_http_response_ok( //@TODO: How to check if a file is present in the body? - ))) -> value v_response { + ))) -> value v_response { tc_ac.stop; log("*** " & testcasename() & ": PASS: IUT successfully responds with and APP Descriptor and a 200 ok status code ***"); f_selfOrClientSyncAndVerdict(c_tbDone, e_success); @@ -406,9 +406,9 @@ module AtsMec_PkgMgmt_mm3_TestCases { } // End of 'alt' statement } // End of testcase TP_MEC_MEPM_PKGM_004_OK - /** + /** * @desc: Check that MEPM responds with an error when it receives - * a request for returning a App Descriptor referred with a wrong App Package ID + * a request for returning a App Descriptor referred with a wrong App Package ID * @see: ETSI GS MEC 010-2 2.0.10, clause 7.4.4.3.2 */ testcase TP_MEC_MEPM_PKGM_004_NF() runs on HttpComponent system HttpTestAdapter { @@ -459,7 +459,7 @@ module AtsMec_PkgMgmt_mm3_TestCases { group pkg_mgmt_subscriptions { - /** + /** * @desc: Check that MEPM service returns an application package subscription when requested * ETSI GS MEC 010-2 2.0.10, clause 7.4.5.3.1 */ @@ -486,12 +486,12 @@ group pkg_mgmt_subscriptions { "/" & PICS_ROOT_API & PX_MEPM_PKGM_SUBS, v_headers, m_http_message_body_json( - m_body_json_mepm_pkgm_subscription( - m_app_package_subscription( - PX_CALLBACK_URI, - PX_SUBSCRIPTION_TYPE - ) - ) + m_body_json_mepm_pkgm_subscription( + m_app_package_subscription( + PX_CALLBACK_URI, + PX_SUBSCRIPTION_TYPE + ) + ) ) ) )); @@ -506,11 +506,11 @@ group pkg_mgmt_subscriptions { mw_http_response_ok( mw_http_message_body_json( mw_body_json_mepm_pkgm_subscription_info( - mw_app_package_subscription_info( - -, - PX_SUBSCRIPTION_TYPE, - PX_CALLBACK_URI - ) + mw_app_package_subscription_info( + -, + PX_SUBSCRIPTION_TYPE, + PX_CALLBACK_URI + ) ))))) -> value v_response { tc_ac.stop; @@ -524,9 +524,9 @@ group pkg_mgmt_subscriptions { } // End of 'alt' statement } // End of testcase TP_MEC_MEPM_PKGM_005_OK - /** + /** * @desc: Check that MEPM service sends an error when it receives a - * malformed request for creating a new subscription on AppPackages + * malformed request for creating a new subscription on AppPackages * ETSI GS MEC 010-2 2.0.10, clause 7.4.5.3.1 */ testcase TP_MEC_MEPM_PKGM_005_BR() runs on HttpComponent system HttpTestAdapter { @@ -552,12 +552,12 @@ group pkg_mgmt_subscriptions { "/" & PICS_ROOT_API & PX_MEPM_PKGM_SUBS, v_headers, m_http_message_body_json( - m_body_json_mepm_pkgm_subscription_with_error( - m_app_package_subscription_with_error( - PX_CALLBACK_URI, - PX_SUBSCRIPTION_TYPE_WITH_ERROR - ) - ) + m_body_json_mepm_pkgm_subscription_with_error( + m_app_package_subscription_with_error( + PX_CALLBACK_URI, + PX_SUBSCRIPTION_TYPE_WITH_ERROR + ) + ) ) ))); @@ -581,7 +581,7 @@ group pkg_mgmt_subscriptions { } // End of 'alt' statement } // End of testcase TP_MEC_MEPM_PKGM_005_BR - /** + /** * @desc: Check that MEPM service returns the list of Application Package Subscriptions when requested * ETSI GS MEC 010-2 2.0.10, clause 7.4.5.3.2 */ @@ -620,15 +620,15 @@ group pkg_mgmt_subscriptions { mw_http_response_ok( mw_http_message_body_json( mw_body_json_mepm_pkgm_subscription_info_list( - { - *, - mw_app_package_subscription_info( - -, - PX_SUBSCRIPTION_TYPE, - PX_CALLBACK_URI - ), - * - } + { + *, + mw_app_package_subscription_info( + -, + PX_SUBSCRIPTION_TYPE, + PX_CALLBACK_URI + ), + * + } ))))) -> value v_response { tc_ac.stop; @@ -643,7 +643,7 @@ group pkg_mgmt_subscriptions { } // End of testcase TP_MEC_MEPM_PKGM_006_OK - /** + /** * @desc: Check that MEPM service returns an Application Package Subscription when requested * ETSI GS MEC 010-2 2.0.10, clause 7.4.6.3.2 */ @@ -682,11 +682,11 @@ group pkg_mgmt_subscriptions { mw_http_response_ok( mw_http_message_body_json( mw_body_json_mepm_pkgm_subscription_info( - mw_app_package_subscription_info( - PX_SUBSCRIPTION_ID, - PX_SUBSCRIPTION_TYPE, - PX_CALLBACK_URI - ) + mw_app_package_subscription_info( + PX_SUBSCRIPTION_ID, + PX_SUBSCRIPTION_TYPE, + PX_CALLBACK_URI + ) ))))) -> value v_response { tc_ac.stop; @@ -701,9 +701,9 @@ group pkg_mgmt_subscriptions { } // End of testcase TP_MEC_MEPM_PKGM_007_OK - /** + /** * @desc: Check that MEPM service sends an error when it receives a query - * for a subscription on AppPackages with a wrong identifier + * for a subscription on AppPackages with a wrong identifier * ETSI GS MEC 010-2 2.0.10, clause 7.4.6.3.2 */ testcase TP_MEC_MEPM_PKGM_007_NF() runs on HttpComponent system HttpTestAdapter { @@ -739,7 +739,7 @@ group pkg_mgmt_subscriptions { [] httpPort.receive( mw_http_response( mw_http_response_404_not_found( - ))) -> value v_response { + ))) -> value v_response { tc_ac.stop; log("*** " & testcasename() & ": PASS: IUT successfully responds with 404 not found ***"); @@ -752,7 +752,7 @@ group pkg_mgmt_subscriptions { } // End of 'alt' statement } // End of testcase TP_MEC_MEPM_PKGM_007_NF - /** + /** * @desc: Check that MEPM service deletes an Application Package Subscription when requested * ETSI GS MEC 010-2 2.0.10, clause 7.4.6.3.4 */ @@ -803,9 +803,9 @@ group pkg_mgmt_subscriptions { } // End of testcase TP_MEC_MEPM_PKGM_008_OK - /** + /** * @desc: Check that MEPM service sends an error when it receives a deletion request - * for a subscription on AppPackages with a wrong identifier + * for a subscription on AppPackages with a wrong identifier * ETSI GS MEC 010-2 2.0.10, clause 7.4.6.3.4 */ testcase TP_MEC_MEPM_PKGM_008_NF() runs on HttpComponent system HttpTestAdapter { @@ -841,7 +841,7 @@ group pkg_mgmt_subscriptions { [] httpPort.receive( mw_http_response( mw_http_response_404_not_found( - ))) -> value v_response { + ))) -> value v_response { tc_ac.stop; log("*** " & testcasename() & ": PASS: IUT successfully responds with 404 not found ***"); @@ -860,7 +860,7 @@ group mepm_pkg_management_notification { /** * @desc Check that the MEPM service sends a application package notification if - * the MEPM service has an associated subscription and the event is generated + * the MEPM service has an associated subscription and the event is generated * @see ETSI GS MEC 010-2 2.0.10, clause 7.4.7.3.1 */ testcase TP_MEC_MEPM_PKGM_009_OK() runs on HttpComponent system HttpTestAdapter { @@ -888,17 +888,17 @@ group mepm_pkg_management_notification { tc_wait.start; alt { [] httpPort_notif.receive( - mw_http_request( - mw_http_request_post( - unichar2char(PX_CALLBACK_URI), + mw_http_request( + mw_http_request_post( + oct2char(unichar2oct(PX_CALLBACK_URI)), -, - mw_http_message_body_json( - mw_body_json_mepm_app_package_notification( - mw_app_package_notification( - -, - PX_NOTIFICATION_TYPE, - PX_SUBSCRIPTION_ID, - PX_CALLBACK_URI) + mw_http_message_body_json( + mw_body_json_mepm_app_package_notification( + mw_app_package_notification( + -, + PX_NOTIFICATION_TYPE, + PX_SUBSCRIPTION_ID, + PX_CALLBACK_URI) ) ) ) diff --git a/ttcn/AtsMec/AtsMec_RadioNodeLocationAPI_TestCases.ttcn b/ttcn/AtsMec/AtsMec_RadioNodeLocationAPI_TestCases.ttcn index 374d0655cf63bdb169b495a7d4bcf97a0800ad66..6749a08aed278f9c69a7ffa15b31bbca32d26641 100644 --- a/ttcn/AtsMec/AtsMec_RadioNodeLocationAPI_TestCases.ttcn +++ b/ttcn/AtsMec/AtsMec_RadioNodeLocationAPI_TestCases.ttcn @@ -446,7 +446,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_LOC_QRY_URI, "UTF-8")) & "?address=" & oct2char(unichar2oct(PX_IP_ADDRESS, "UTF-8")) & "&latitude=" & float2str(PX_UE_COORD_LAT) & "&longitude=" & float2str(PX_UE_COORD_LONG), + "/" & PICS_ROOT_API & PX_UE_LOC_QRY_URI & "?address=" & oct2char(unichar2oct(PX_IP_ADDRESS, "UTF-8")) & "&latitude=" & float2str(PX_UE_COORD_LAT) & "&longitude=" & float2str(PX_UE_COORD_LONG), v_headers ) ) @@ -503,7 +503,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_LOC_QRY_URI, "UTF-8")) & "?address=" & oct2char(unichar2oct(PX_IP_ADDRESS, "UTF-8")) & "&lat=" & float2str(PX_UE_COORD_LAT) & "&longitude=" & float2str(PX_UE_COORD_LONG), + "/" & PICS_ROOT_API & PX_UE_LOC_QRY_URI & "?address=" & oct2char(unichar2oct(PX_IP_ADDRESS, "UTF-8")) & "&lat=" & float2str(PX_UE_COORD_LAT) & "&longitude=" & float2str(PX_UE_COORD_LONG), v_headers ) ) @@ -565,7 +565,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_post( - "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_DIST_SUB_URI, "UTF-8")), + "/" & PICS_ROOT_API & PX_UE_DIST_SUB_URI, v_headers, m_http_message_body_json( m_body_json_distance_notification_subscription( @@ -649,7 +649,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_post( - "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_DIST_SUB_URI, "UTF-8")), + "/" & PICS_ROOT_API & PX_UE_DIST_SUB_URI, v_headers, m_http_message_body_json( m_body_json_distance_notification_subscription( @@ -715,7 +715,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_delete( - "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_DIST_SUB_URI, "UTF-8")) & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")), + "/" & PICS_ROOT_API & PX_UE_DIST_SUB_URI & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")), v_headers ) ) @@ -769,7 +769,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_delete( - "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_DIST_SUB_URI, "UTF-8")) & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")), + "/" & PICS_ROOT_API & PX_UE_DIST_SUB_URI & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")), v_headers ) ) @@ -830,7 +830,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_LOC_USERS_URI)) & "?address=" & oct2char(unichar2oct(PX_ACR_SOME_IP, "UTF-8")), + "/" & PICS_ROOT_API & PX_UE_LOC_USERS_URI & "?address=" & oct2char(unichar2oct(PX_ACR_SOME_IP, "UTF-8")), v_headers ) ) @@ -887,7 +887,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_LOC_USERS_URI, "UTF-8")) & "?addr=" & oct2char(unichar2oct(PX_ACR_SOME_IP, "UTF-8")), + "/" & PICS_ROOT_API & PX_UE_LOC_USERS_URI & "?addr=" & oct2char(unichar2oct(PX_ACR_SOME_IP, "UTF-8")), v_headers ) ) @@ -941,7 +941,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_LOC_USERS_URI, "UTF-8")) & "?address=" & oct2char(unichar2oct(PX_ACR_UNKNOWN_IP, "UTF-8")), + "/" & PICS_ROOT_API & PX_UE_LOC_USERS_URI & "?address=" & oct2char(unichar2oct(PX_ACR_UNKNOWN_IP, "UTF-8")), v_headers ) ) @@ -1264,7 +1264,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_LOC_USERS_URI, "UTF-8")) & "?zoneId=" & oct2char(unichar2oct(PX_ZONE_ID, "UTF-8")), + "/" & PICS_ROOT_API & PX_UE_LOC_USERS_URI & "?zoneId=" & oct2char(unichar2oct(PX_ZONE_ID, "UTF-8")), v_headers ) ) @@ -1322,7 +1322,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_LOC_USERS_URI, "UTF-8")) & "?zone=" & oct2char(unichar2oct(PX_ZONE_ID, "UTF-8")), + "/" & PICS_ROOT_API & PX_UE_LOC_USERS_URI & "?zone=" & oct2char(unichar2oct(PX_ZONE_ID, "UTF-8")), v_headers ) ) @@ -1376,7 +1376,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_LOC_USERS_URI, "UTF-8")) & "?zoneId=" & oct2char(unichar2oct(PX_NON_EXISTENT_ZONE_ID, "UTF-8")), + "/" & PICS_ROOT_API & PX_UE_LOC_USERS_URI & "?zoneId=" & oct2char(unichar2oct(PX_NON_EXISTENT_ZONE_ID, "UTF-8")), v_headers ) ) @@ -1438,7 +1438,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_post( - "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_LOC_USERTRACK_SUB_URI, "UTF-8")), + "/" & PICS_ROOT_API & PX_UE_LOC_USERTRACK_SUB_URI, v_headers, m_http_message_body_json( m_body_json_user_tracking_subscription( @@ -1519,7 +1519,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_post( - "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_LOC_USERTRACK_SUB_URI, "UTF-8")), + "/" & PICS_ROOT_API & PX_UE_LOC_USERTRACK_SUB_URI, v_headers, m_http_message_body_json( m_body_json_user_tracking_subscription( @@ -1584,7 +1584,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_delete( - "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_LOC_USERTRACK_SUB_URI, "UTF-8")) & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")), + "/" & PICS_ROOT_API & PX_UE_LOC_USERTRACK_SUB_URI & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")), v_headers ) ) @@ -1638,7 +1638,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_delete( - "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_LOC_USERTRACK_SUB_URI, "UTF-8")) & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")), + "/" & PICS_ROOT_API & PX_UE_LOC_USERTRACK_SUB_URI & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")), v_headers ) ) @@ -1700,7 +1700,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_post( - "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_PERIODIC_SUB_URI, "UTF-8")), + "/" & PICS_ROOT_API & PX_UE_PERIODIC_SUB_URI, v_headers, m_http_message_body_json( m_body_json_periodic_notification_subscription( @@ -1781,7 +1781,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_post( - "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_PERIODIC_SUB_URI, "UTF-8")), + "/" & PICS_ROOT_API & PX_UE_PERIODIC_SUB_URI, v_headers, m_http_message_body_json( m_body_json_user_tracking_subscription( @@ -1845,7 +1845,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_delete( - "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_PERIODIC_SUB_URI, "UTF-8")) & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")), + "/" & PICS_ROOT_API & PX_UE_PERIODIC_SUB_URI & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")), v_headers ) ) @@ -1898,7 +1898,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_delete( - "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_LOC_USERTRACK_SUB_URI, "UTF-8")) & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")), + "/" & PICS_ROOT_API & PX_UE_LOC_USERTRACK_SUB_URI & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")), v_headers ) ) diff --git a/ttcn/LibMec/Ams/ttcn/Ams_Pixits.ttcn b/ttcn/LibMec/Ams/ttcn/Ams_Pixits.ttcn index 9874e63f5e20f51a34b8c297999976086568f8b8..17763e1c120d714de91e39dd4c08fe1e305b6cf5 100644 --- a/ttcn/LibMec/Ams/ttcn/Ams_Pixits.ttcn +++ b/ttcn/LibMec/Ams/ttcn/Ams_Pixits.ttcn @@ -6,21 +6,21 @@ module Ams_Pixits { // LibMec/LocationAPI import from Ams_TypesAndValues all; - modulepar JSON.String PX_APP_MOBILITY_SERVICE_ID := "KtRGymNQ84dG3mQfRepa" + modulepar JSON.String PX_APP_MOBILITY_SERVICE_ID := "KtRGymNQ84dG3mQfRepa"; - modulepar JSON.String PX_APP_INS_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f" + modulepar JSON.String PX_APP_INS_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f"; - modulepar SubscriptionType PX_SUBSCRIPTION_TYPE := MobilityProcedureSubscription + modulepar SubscriptionType PX_SUBSCRIPTION_TYPE := MobilityProcedureSubscription; - modulepar JSON.String PX_SUBSCRIPTION_ID := "e0deee2b-6e50-4f33-ab09-8bf0585025d3" + modulepar JSON.String PX_SUBSCRIPTION_ID := "e0deee2b-6e50-4f33-ab09-8bf0585025d3"; - modulepar JSON.String PX_NON_EXISTENT_SUBSCRIPTION_ID := "NON_EXISTENT_SUBSCRIPTION_ID" + modulepar JSON.String PX_NON_EXISTENT_SUBSCRIPTION_ID := "NON_EXISTENT_SUBSCRIPTION_ID"; - modulepar JSON.String PX_NON_EXISTENT_APP_MOBILITY_SERVICE_ID := "PX_NON_EXISTENT_APP_MOBILITY_SERVICE_ID" + modulepar JSON.String PX_NON_EXISTENT_APP_MOBILITY_SERVICE_ID := "PX_NON_EXISTENT_APP_MOBILITY_SERVICE_ID"; - modulepar JSON.String PX_CALLBACK_REFERENCE := "http://127.0.0.1/callback" + modulepar JSON.String PX_CALLBACK_REFERENCE := "http://127.0.0.1/callback"; - modulepar charstring PX_CALLBACK_URI := "http://127.0.0.1/callback" + modulepar charstring PX_CALLBACK_URI := "http://127.0.0.1/callback"; modulepar JSON.String PX_MEP_ID := ""; diff --git a/ttcn/LibMec/Ams/ttcn/Ams_Templates.ttcn b/ttcn/LibMec/Ams/ttcn/Ams_Templates.ttcn index a4ed7daac7655c986d38a0b44522974af808e448..b0d819e52ec605c8e99ecdb5eb16dfe423dd0305 100644 --- a/ttcn/LibMec/Ams/ttcn/Ams_Templates.ttcn +++ b/ttcn/LibMec/Ams/ttcn/Ams_Templates.ttcn @@ -174,7 +174,7 @@ module Ams_Templates { Subscription subscription } - template (value) AdjacentAppInfoSubscription mw_adjacent_application_info_notification ( + template (value) AdjacentAppInfoSubscription_ mw_adjacent_application_info_notification ( in template (omit) SubscriptionType p_subscriptionType := omit, in JSON.AnyURI p_callbackReference, in template (omit) JSON.AnyURI p_links := omit, @@ -190,7 +190,7 @@ module Ams_Templates { } - template (value) MobilityProcedureSubscription m_ams_subscription ( + template (value) MobilityProcedureSubscription_ m_ams_subscription ( in SubscriptionType p_subscriptionType := PX_SUBSCRIPTION_TYPE, in JSON.AnyURI p_callbackReference, in template (omit) JSON.AnyURI p_links := omit, @@ -207,7 +207,7 @@ module Ams_Templates { - template (value) MobilityProcedureSubscription mw_mobility_procedure_notification ( + template (value) MobilityProcedureSubscription_ mw_mobility_procedure_notification ( in template (omit) SubscriptionType p_subscriptionType := omit, in JSON.AnyURI p_callbackReference, in template (omit) JSON.AnyURI p_links := omit, @@ -237,7 +237,7 @@ module Ams_Templates { expiryDeadline := p_expiryDeadline } - template (present) MobilityProcedureSubscription mw_ams_subscription ( + template (present) MobilityProcedureSubscription_ mw_ams_subscription ( in SubscriptionType p_subscriptionType, in template (omit) JSON.AnyURI p_callbackReference := omit, in template (omit) JSON.AnyURI p_links := omit, diff --git a/ttcn/LibMec/Ams/ttcn/Ams_TypesAndValues.ttcn b/ttcn/LibMec/Ams/ttcn/Ams_TypesAndValues.ttcn index 70d5600fbfc70f52d77ba4add7bbeb2415527ca3..04ce62bba88a422f6d88f8065ff0cee464b8d9fc 100644 --- a/ttcn/LibMec/Ams/ttcn/Ams_TypesAndValues.ttcn +++ b/ttcn/LibMec/Ams/ttcn/Ams_TypesAndValues.ttcn @@ -90,8 +90,8 @@ type record MobilityProcedureSubscriptionError { -type record of MobilityProcedureSubscription MobilityProcedureSubscriptions; -type record MobilityProcedureSubscription { +type record of MobilityProcedureSubscription_ MobilityProcedureSubscriptions; +type record MobilityProcedureSubscription_ { SubscriptionType subscriptionType, JSON.AnyURI callbackReference, JSON.AnyURI links optional, @@ -132,8 +132,8 @@ type record ExpiryNotification { TimeStamp expiryDeadline } -type record of AdjacentAppInfoSubscription AdjacentAppInfoSubscriptions; -type record AdjacentAppInfoSubscription { +type record of AdjacentAppInfoSubscription_ AdjacentAppInfoSubscriptions; +type record AdjacentAppInfoSubscription_ { SubscriptionType subscriptionType, JSON.AnyURI callbackReference, JSON.AnyURI links optional, diff --git a/ttcn/LibMec/AppEna/ttcn/AppEnablementAPI_Templates.ttcn b/ttcn/LibMec/AppEna/ttcn/AppEnablementAPI_Templates.ttcn index 4325f1f7fcd37fdbf58012d56a59133067819693..75cf03449d530834423790aa0a2b22ce7cecfdfb 100644 --- a/ttcn/LibMec/AppEna/ttcn/AppEnablementAPI_Templates.ttcn +++ b/ttcn/LibMec/AppEna/ttcn/AppEnablementAPI_Templates.ttcn @@ -200,30 +200,30 @@ module AppEnablementAPI_Templates { state := p_state } // End of template mw_dns_rule - template (omit) SerAvailabilityNotificationSubscription m_srv_avail_notif_subscription( - in template (value) SerAvailabilityNotificationSubscription_CallbackReference p_callbackReference, - in template (omit) Self p_links := omit, - in template (omit) ServiceInfo p_filteringCriteria := omit - ) := { + template (omit) SerAvailabilityNotificationSubscription_ m_srv_avail_notif_subscription( + in template (value) SerAvailabilityNotificationSubscription_CallbackReference p_callbackReference, + in template (omit) Self p_links := omit, + in template (omit) ServiceInfo p_filteringCriteria := omit + ) := { subscriptionType := "SerAvailabilityNotificationSubscription", callbackReference := p_callbackReference, links := p_links, filteringCriteria := p_filteringCriteria } // End of template m_srv_avail_notif_subscription - template (omit) SerAvailabilityNotificationSubscription m_srv_avail_notif_subscription_invalid( - in template (value) SerAvailabilityNotificationSubscription_CallbackReference p_callbackReference, - in template (omit) Self p_links := omit, - in template (omit) ServiceInfo p_filteringCriteria := omit - ) modifies m_srv_avail_notif_subscription := { + template (omit) SerAvailabilityNotificationSubscription_ m_srv_avail_notif_subscription_invalid( + in template (value) SerAvailabilityNotificationSubscription_CallbackReference p_callbackReference, + in template (omit) Self p_links := omit, + in template (omit) ServiceInfo p_filteringCriteria := omit + ) modifies m_srv_avail_notif_subscription := { subscriptionType := "InvalidSerAvailabilityNotificationSubscription" } // End of template m_srv_avail_notif_subscription_invalid - template SerAvailabilityNotificationSubscription mw_srv_avail_notif_subscription( - template (present) SerAvailabilityNotificationSubscription_CallbackReference p_callbackReference := ?, - template Self p_links := *, - template ServiceInfo p_filteringCriteria := * - ) := { + template SerAvailabilityNotificationSubscription_ mw_srv_avail_notif_subscription( + template (present) SerAvailabilityNotificationSubscription_CallbackReference p_callbackReference := ?, + template Self p_links := *, + template ServiceInfo p_filteringCriteria := * + ) := { subscriptionType := "SerAvailabilityNotificationSubscription", callbackReference := p_callbackReference, links := p_links, diff --git a/ttcn/LibMec/AppEna/ttcn/AppEnablementAPI_TypesAndValues.ttcn b/ttcn/LibMec/AppEna/ttcn/AppEnablementAPI_TypesAndValues.ttcn index 11dd7ae469eb94332c2eff9f0155a80876a47133..3601279512e84f338cda585a782ee029894de967 100644 --- a/ttcn/LibMec/AppEna/ttcn/AppEnablementAPI_TypesAndValues.ttcn +++ b/ttcn/LibMec/AppEna/ttcn/AppEnablementAPI_TypesAndValues.ttcn @@ -272,7 +272,7 @@ module AppEnablementAPI_TypesAndValues { /** * @desc The values are as defined in the \"subscriptionType\" attribute for each different Mp1 event subscription data type. */ - type enumerated Rel { + type enumerated Rel_ { // TODO To be renamed into SubscriptionType AppTerminationNotificationSubscription, SerAvailabilityNotificationSubscription } @@ -282,7 +282,7 @@ module AppEnablementAPI_TypesAndValues { */ type record Mp1SubscriptionLinkList_Subscription { Href href, - Rel rel + Rel_ rel } type record length(0..infinity) of Mp1SubscriptionLinkList_Subscription Mp1SubscriptionLinkList_SubscriptionList; @@ -390,7 +390,7 @@ module AppEnablementAPI_TypesAndValues { /** * @desc This type represents a subscription to the notifications from the mobile edge platform regarding the availability of a mobile edge service or a list of mobile edge services. */ - type record SerAvailabilityNotificationSubscription { + type record SerAvailabilityNotificationSubscription_ { SerAvailabilityNotificationSubscription_SubscriptionType subscriptionType, SerAvailabilityNotificationSubscription_CallbackReference callbackReference, Self links optional, @@ -708,7 +708,7 @@ module AppEnablementAPI_TypesAndValues { } with { variant (action_) "name as 'action'"; } - type record of TrafficRule TrafficRuleList + type record of TrafficRule TrafficRuleList; /** * @desc Human-readable description of this transport. diff --git a/ttcn/LibMec/AppLCM/ttcn/AppLCM_Pixits.ttcn b/ttcn/LibMec/AppLCM/ttcn/AppLCM_Pixits.ttcn index 828e9cfaf76a91520521ea9419fbcdd5154e2844..a5cefed63309de55b3e538dccb15866a15392027 100644 --- a/ttcn/LibMec/AppLCM/ttcn/AppLCM_Pixits.ttcn +++ b/ttcn/LibMec/AppLCM/ttcn/AppLCM_Pixits.ttcn @@ -2,41 +2,40 @@ module AppLCM_Pixits { // JSON import from JSON all; - + // LibMec/AppLCM import from AppLCM_TypesAndValues all; + modulepar JSON.String PX_APP_D_ID := "5lkj4782-2c70-4e47-9a4e-0ee3a1a0fd1f"; - modulepar JSON.String PX_APP_D_ID := "5lkj4782-2c70-4e47-9a4e-0ee3a1a0fd1f" - - modulepar InstantiationState PX_INSTANTIATION_STATE := NOT_INSTANTIATED + modulepar InstantiationState PX_INSTANTIATION_STATE := NOT_INSTANTIATED; - modulepar JSON.String PX_APP_INSTANCE_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f" + modulepar JSON.String PX_APP_INSTANCE_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f"; - modulepar JSON.String PX_NON_EXISTENT_APP_INSTANCE_ID := "PX_NON_EXISTENT_APP_INSTANCE_ID" + modulepar JSON.String PX_NON_EXISTENT_APP_INSTANCE_ID := "PX_NON_EXISTENT_APP_INSTANCE_ID"; - modulepar TerminationType PX_APP_TERMINATION_TYPE := GRACEFUL + modulepar TerminationType PX_APP_TERMINATION_TYPE := GRACEFUL; - modulepar TerminationTypeWithError PX_APP_TERMINATION_TYPE_WITH_ERROR := GRACE + modulepar TerminationTypeWithError PX_APP_TERMINATION_TYPE_WITH_ERROR := GRACE; - modulepar OperationType PX_CHANGE_STATE_TO := STARTED + modulepar OperationType PX_CHANGE_STATE_TO := STARTED; - modulepar OperationTypeWithError PX_CHANGE_STATE_TO_WITH_ERROR := START + modulepar OperationTypeWithError PX_CHANGE_STATE_TO_WITH_ERROR := START; - modulepar JSON.String PX_APP_LCM_OP_OCC_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f" + modulepar JSON.String PX_APP_LCM_OP_OCC_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f"; - modulepar JSON.String PX_NON_EXISTENT_APP_LCM_OP_OCC_ID := "PX_NON_EXISTENT_APP_LCM_OP_OCC_ID" + modulepar JSON.String PX_NON_EXISTENT_APP_LCM_OP_OCC_ID := "PX_NON_EXISTENT_APP_LCM_OP_OCC_ID"; - modulepar JSON.AnyURI PX_CALLBACK_URI := "http://127.0.0.1/callback" + modulepar JSON.AnyURI PX_CALLBACK_URI := "http://127.0.0.1/callback"; - modulepar SubscriptionType PX_SUBSCRIPTION_TYPE := AppInstanceStateChangeSubscription + modulepar SubscriptionType PX_SUBSCRIPTION_TYPE := AppInstanceStateChangeSubscription; - modulepar JSON.String PX_SUBSCRIPTION_ID := "e0deee2b-6e50-4f33-ab09-8bf0585025d3" + modulepar JSON.String PX_SUBSCRIPTION_ID := "e0deee2b-6e50-4f33-ab09-8bf0585025d3"; - modulepar JSON.String PX_NON_ESISTENT_SUBSCRIPTION_ID := "PX_NON_ESISTENT_SUBSCRIPTION_ID" + modulepar JSON.String PX_NON_ESISTENT_SUBSCRIPTION_ID := "PX_NON_ESISTENT_SUBSCRIPTION_ID"; - modulepar JSON.String PX_NOTIFICATION_ID := "208c95ec-121f-4bc2-b896-be3fe000d3ea" + modulepar JSON.String PX_NOTIFICATION_ID := "208c95ec-121f-4bc2-b896-be3fe000d3ea"; - modulepar NotificationType PX_NOTIFICATION_TYPE := AppInstNotification + modulepar NotificationType PX_NOTIFICATION_TYPE := AppInstNotification; } // End of module \ No newline at end of file diff --git a/ttcn/LibMec/AppLCM/ttcn/AppLCM_TypesAndValues.ttcn b/ttcn/LibMec/AppLCM/ttcn/AppLCM_TypesAndValues.ttcn index 9261f161d85d225cf512ec07880106c61435c927..73674dc92ec5deb763392c1f9322945d2c198f8c 100644 --- a/ttcn/LibMec/AppLCM/ttcn/AppLCM_TypesAndValues.ttcn +++ b/ttcn/LibMec/AppLCM/ttcn/AppLCM_TypesAndValues.ttcn @@ -62,7 +62,7 @@ type record AppInstanceInfo { InstantiationState instantiationState } -type record of SelectedMECHostInfo SelectedMECHostInfoList +type record of SelectedMECHostInfo SelectedMECHostInfoList; type record SelectedMECHostInfo { } diff --git a/ttcn/LibMec/FixedAccessInformationAPI/ttcn/FixedAccessInformationServiceAPI_Pics.ttcn b/ttcn/LibMec/FixedAccessInformationAPI/ttcn/FixedAccessInformationServiceAPI_Pics.ttcn new file mode 100644 index 0000000000000000000000000000000000000000..670fd237eb1f9daaa02f27c498eef25935b4a47d --- /dev/null +++ b/ttcn/LibMec/FixedAccessInformationAPI/ttcn/FixedAccessInformationServiceAPI_Pics.ttcn @@ -0,0 +1,5 @@ +module FixedAccessInformationServiceAPI_Pics { + + modulepar boolean PICS_FAI_API_SUPPORTED := true; + +} // End of module FixedAccessInformationServiceAPI_Pics diff --git a/ttcn/LibMec/FixedAccessInformationAPI/ttcn/FixedAccessInformationServiceAPI_Pixits.ttcn b/ttcn/LibMec/FixedAccessInformationAPI/ttcn/FixedAccessInformationServiceAPI_Pixits.ttcn new file mode 100644 index 0000000000000000000000000000000000000000..7581680870909e8550efff679b1653ba507141d0 --- /dev/null +++ b/ttcn/LibMec/FixedAccessInformationAPI/ttcn/FixedAccessInformationServiceAPI_Pixits.ttcn @@ -0,0 +1,31 @@ +module FixedAccessInformationServiceAPI_Pixits { + + // JSON + import from JSON all; + + // LibMec_FixedAccessInformationServiceAPI + import from FixedAccessInformationServiceAPI_TypesAndValues all; + + modulepar GatewayId PX_FAI_GW_ID := { "" }; + + modulepar GatewayId PX_NON_EXISTING_FAI_GW_ID := { "" }; + + modulepar CmdId PX_FAI_CM_ID := ""; + + modulepar CmdId PX_NON_EXISTING_FAI_CM_ID := ""; + + modulepar OnuId PX_FAI_ONU_ID := ""; + + modulepar OnuId PX_NON_EXISTING_FAI_ONU_ID := ""; + + modulepar JSON.String PX_FAI_SUB_ID := ""; + + modulepar JSON.String PX_NON_EXISTING_FAI_SUB_ID := ""; + + modulepar JSON.AnyURI PX_ONU_ALARM_SUB_CALLBACK_URI := ""; + + modulepar JSON.String PX_SUBSCRIPTION_ID := ""; + + modulepar JSON.String PX_NON_EXISTENT_SUBSCRIPTION_ID := ""; + +} // End of module FixedAccessInformationServiceAPI_Pixits diff --git a/ttcn/LibMec/FixedAccessInformationAPI/ttcn/FixedAccessInformationServiceAPI_Templates.ttcn b/ttcn/LibMec/FixedAccessInformationAPI/ttcn/FixedAccessInformationServiceAPI_Templates.ttcn new file mode 100644 index 0000000000000000000000000000000000000000..91aecd488de0aa2a738d1be73140c0066463d98f --- /dev/null +++ b/ttcn/LibMec/FixedAccessInformationAPI/ttcn/FixedAccessInformationServiceAPI_Templates.ttcn @@ -0,0 +1,228 @@ +module FixedAccessInformationServiceAPI_Templates { + + // JSON + import from JSON all; + + // LibCommon + import from LibCommon_BasicTypesAndValues all; + + // LibMec_FixedAccessInformationServiceAPI + import from FixedAccessInformationServiceAPI_TypesAndValues all; + import from FixedAccessInformationServiceAPI_Pixits all; + + template (omit) FaInfo m_fa_info( + in template (value) CpInfo p_customerPremisesInfo, + in template (omit) TimeStamp p_timeStamp := omit, + in template (omit) ConnectivityInfo p_connectivityInfo := omit + ) := { + timeStamp := p_timeStamp, + customerPremisesInfo := p_customerPremisesInfo, + connectivityInfo := p_connectivityInfo + } // End of template m_fa_info + + template FaInfo mw_fa_info( + template (present) CpInfo p_customerPremisesInfo := ?, + template TimeStamp p_timeStamp := *, + template ConnectivityInfo p_connectivityInfo := * + ) := { + timeStamp := p_timeStamp, + customerPremisesInfo := p_customerPremisesInfo, + connectivityInfo := p_connectivityInfo + } // End of template mw_fa_info + + template (omit) DeviceInfo m_device_info( + in template (value) GatewayId p_gwId, + in template (value) DeviceStatus p_deviceStatus, + in template (value) JSON.Number p_upTime, + in template (value) JSON.Number p_iPConnectionUpTime, + in template (value) JSON.Number p_totalBytesSent, + in template (value) JSON.Number p_totalBytesReceived, + in template (value) JSON.Number p_totalPacketsSent, + in template (value) JSON.Number p_totalPacketsReceived, + in template (omit) TimeStamp p_timeStamp := omit, + in template (omit) DeviceId p_deviceId := omit, + in template (omit) IPPingDiagnostics p_iPPingDiagnostics := omit, + in template (omit) TraceRouteDiagnostics p_traceRouteDiagnostics := omit, + in template (omit) DownloadDiagnostics p_downloadDiagnostics := omit, + in template (omit) UploadDiagnostics p_uploadDiagnostics := omit + ) := { + timeStamp := p_timeStamp, + gwId := p_gwId, + deviceId := p_deviceId, + deviceStatus := p_deviceStatus, + upTime := p_upTime, + iPConnectionUpTime := p_iPConnectionUpTime, + totalBytesSent := p_totalBytesSent, + totalBytesReceived := p_totalBytesReceived, + totalPacketsSent := p_totalPacketsSent, + totalPacketsReceived := p_totalPacketsReceived, + iPPingDiagnostics := p_iPPingDiagnostics, + traceRouteDiagnostics := p_traceRouteDiagnostics, + downloadDiagnostics := p_downloadDiagnostics, + uploadDiagnostics := p_uploadDiagnostics + } // End of template m_device_info + + template DeviceInfo mw_device_info( + template (present) GatewayId p_gwId := ?, + template (present) DeviceStatus p_deviceStatus := ?, + template (present) JSON.Number p_upTime := ?, + template (present) JSON.Number p_iPConnectionUpTime := ?, + template (present) JSON.Number p_totalBytesSent := ?, + template (present) JSON.Number p_totalBytesReceived := ?, + template (present) JSON.Number p_totalPacketsSent := ?, + template (present) JSON.Number p_totalPacketsReceived := ?, + template TimeStamp p_timeStamp := *, + template DeviceId p_deviceId := *, + template IPPingDiagnostics p_iPPingDiagnostics := *, + template TraceRouteDiagnostics p_traceRouteDiagnostics := *, + template DownloadDiagnostics p_downloadDiagnostics := *, + template UploadDiagnostics p_uploadDiagnostics := * + ) := { + timeStamp := p_timeStamp, + gwId := p_gwId, + deviceId := p_deviceId, + deviceStatus := p_deviceStatus, + upTime := p_upTime, + iPConnectionUpTime := p_iPConnectionUpTime, + totalBytesSent := p_totalBytesSent, + totalBytesReceived := p_totalBytesReceived, + totalPacketsSent := p_totalPacketsSent, + totalPacketsReceived := p_totalPacketsReceived, + iPPingDiagnostics := p_iPPingDiagnostics, + traceRouteDiagnostics := p_traceRouteDiagnostics, + downloadDiagnostics := p_downloadDiagnostics, + uploadDiagnostics := p_uploadDiagnostics + } // End of template mw_device_info + + template (omit) CableLineInfo m_cable_line_info( + in template (value) CpInfo p_customerPremisesInfo, + in template (value) CmdInfo p_cmdInfo, + in template (omit) TimeStamp p_timeStamp := omit + ) := { + timeStamp := p_timeStamp, + customerPremisesInfo := p_customerPremisesInfo, + cmdInfo := p_cmdInfo + } // End of template m_cable_line_info + + template CableLineInfo mw_cable_line_info( + template (present) CpInfo p_customerPremisesInfo := ?, + template (present) CmdInfo p_cmdInfo := ?, + template TimeStamp p_timeStamp := * + ) := { + timeStamp := p_timeStamp, + customerPremisesInfo := p_customerPremisesInfo, + cmdInfo := p_cmdInfo + } // End of template mw_cable_line_info + + template (omit) PonInfo m_pon_info( + in template (value) CpInfo p_customerPremisesInfo, + in template (value) PonSYS_ID p_ponSYS_ID, + in template (value) OpticalNetworkInfo p_opticalNetworkInfo, + in template (omit) TimeStamp p_timeStamp := omit + ) := { + timeStamp := p_timeStamp, + customerPremisesInfo := p_customerPremisesInfo, + ponSYS_ID := p_ponSYS_ID, + opticalNetworkInfo := p_opticalNetworkInfo + } // End of template m_pon_info + + template PonInfo mw_pon_info( + template (present) CpInfo p_customerPremisesInfo := ?, + template (present) PonSYS_ID p_ponSYS_ID := ?, + template (present) OpticalNetworkInfo p_opticalNetworkInfo := ?, + template TimeStamp p_timeStamp := * + ) := { + timeStamp := p_timeStamp, + customerPremisesInfo := p_customerPremisesInfo, + ponSYS_ID := p_ponSYS_ID, + opticalNetworkInfo := p_opticalNetworkInfo + } // End of template mw_pon_info + + template (omit) SubscriptionLinkList m_subscription_link_list( + in template (value) Links p_links, + in template (omit) Subscriptions p_subscription := omit + ) := { + links := p_links, + subscription := p_subscription + } // End of template m_subscription_link_list + + template SubscriptionLinkList mw_subscription_link_list( + template (present) Links p_links := ?, + template Subscriptions p_subscription := * + ) := { + links := p_links, + subscription := p_subscription + } // End of template m_wsubscription_link_list + + template (omit) OnuAlarmSubscription m_onu_alarm_subscription( + in template (value) JSON.AnyURI p_callbackReference, + in template (value) FilterCriteriaOnuAlarm p_filterCriteriaOnuAlarm, + in template (omit) Links p_links := omit, + in template (omit) TimeStamp p_expiryDeadline := omit + ) := { + subscriptionType := "OnuAlarmSubscription", + callbackReference := p_callbackReference, + links := p_links, + filterCriteriaOnuAlarm := p_filterCriteriaOnuAlarm, + expiryDeadline := p_expiryDeadline + } // End of template m_onu_alarm_subscription + + template (omit) OnuAlarmSubscription m_onu_alarm_subscription_bad_request( + in template (value) JSON.AnyURI p_callbackReference, + in template (value) FilterCriteriaOnuAlarm p_filterCriteriaOnuAlarm, + in template (omit) Links p_links := omit, + in template (omit) TimeStamp p_expiryDeadline := omit + ) modifies m_onu_alarm_subscription := { + subscriptionType := "BadSubscriptionType" + } // End of template m_onu_alarm_subscription_bad_request + + template OnuAlarmSubscription mw_onu_alarm_subscription( + template (present) JSON.AnyURI p_callbackReference := ?, + template (present) FilterCriteriaOnuAlarm p_filterCriteriaOnuAlarm := ?, + template Links p_links := *, + template TimeStamp p_expiryDeadline := * + ) := { + subscriptionType := "OnuAlarmSubscription", + callbackReference := p_callbackReference, + links := p_links, + filterCriteriaOnuAlarm := p_filterCriteriaOnuAlarm, + expiryDeadline := p_expiryDeadline + } // End of template mw_onu_alarm_subscription + + template (omit) FilterCriteriaOnuAlarm m_filter_criteria_onu_alarm( + in template (value) OnuIds p_onuId := { PX_FAI_ONU_ID }, + in template (omit) CpInfo p_customerPremisesIxnfo := omit, + in template (omit) Alarms p_alarms := omit + ) := { + customerPremisesInfo := p_customerPremisesIxnfo, + onuId := p_onuId, + alarms := p_alarms + } // End of template m_filter_criteria_onu_alarm + + template FilterCriteriaOnuAlarm mw_filter_criteria_onu_alarm( + template (present) OnuIds p_onuId := ?, + template CpInfo p_customerPremisesIxnfo := *, + template Alarms p_alarms := * + ) := { + customerPremisesInfo := p_customerPremisesIxnfo, + onuId := p_onuId, + alarms := p_alarms + } // End of template mw_filter_criteria_onu_alarm + + template (value) TimeStamp m_time_stamp( + in UInt32 p_seconds, + in UInt32 p_nanoSeconds := 0 + ) := { + seconds := p_seconds, + nanoSeconds := p_nanoSeconds + } // End of temlate m_time_stamp + + template (present) TimeStamp mw_time_stamp( + template (present) UInt32 p_seconds := ?, + template (present) UInt32 p_nanoSeconds := ? + ) := { + seconds := p_seconds, + nanoSeconds := p_nanoSeconds + } // End of temlate mw_time_stamp + +} // End of module FixedAccessInformationServiceAPI_Templates diff --git a/ttcn/LibMec/FixedAccessInformationAPI/ttcn/FixedAccessInformationServiceAPI_TypesAndValues.ttcn b/ttcn/LibMec/FixedAccessInformationAPI/ttcn/FixedAccessInformationServiceAPI_TypesAndValues.ttcn new file mode 100644 index 0000000000000000000000000000000000000000..d328bd5caa1cc35423de593a2537a05653b0d664 --- /dev/null +++ b/ttcn/LibMec/FixedAccessInformationAPI/ttcn/FixedAccessInformationServiceAPI_TypesAndValues.ttcn @@ -0,0 +1,488 @@ +module FixedAccessInformationServiceAPI_TypesAndValues { + + // JSON + import from JSON all; + + // LibCommon + import from LibCommon_BasicTypesAndValues all; + + /** + * @desc The seconds part of the Time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC + */ + type UInt32 Seconds; + + /** + * @desc The nanoseconds part of the Time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC + */ + type UInt32 NanoSeconds; + + /** + * @desc + * @member seconds The seconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC + * @member nanoSeconds The nanoseconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC + */ + type record TimeStamp { + Seconds seconds, + NanoSeconds nanoSeconds + } + + /** + * @desc This type represents the fixed access information. + * @member timeStamp Time stamp. + * @member customerPremisesInfo The physical location of a customer site. + * @member connectivityInfo The per connectivity domain fixed access information. + */ + type record FaInfo { + TimeStamp timeStamp optional, + CpInfo customerPremisesInfo, + ConnectivityInfo connectivityInfo optional + } + + /** + * @desc The per connectivity domain fixed access information. + * @member LastMileTech An informative field identifying the last mile access technology used. + * @member InterfaceType The physical interface used for the end customer site – as defined in IEEE802, ITU, Broadband Forum. + * @member dsbw The bandwidth (in Mbps) from the network towards the customer site. + * @member usbw The bandwidth (in Mbps) from the customer site towards the network. + * @member latency Maximum baseline latency (in ms) between customer site and service edge node. + */ + type record ConnectivityInfo { + LastMileTech lastMileTech optional, + InterfaceType interfaceType, + JSON.Number dsbw optional, + JSON.Number usbw optional, + JSON.Number latency optional + } + + /** + * @desc An informative field identifying the last mile access technology used. + */ + type enumerated LastMileTech { + ADSL, + VDSL, + GPON, + XGPON, + NGPON2, + XGSPON, + GFAST, + P2PEthernet + } + + /** + * @desc The physical interface used for the end customer site – as defined in IEEE802, ITU, Broadband Forum. + */ + type enumerated InterfaceType { + e_100BASE_TX, + e_1000BASE_TX, + e_1000BASE_LX, + e_1000BASELX10, + e_1000BASEBX10, + e_1000BASE_LH, + e_1000Base_ZX, + ADSL_RJ11, + VDSL_RJ11, + GPON + } + + /** + * @desc Latitude (DATUM=WGS84) -90 to 90 in decimal degree format DDD.ddd + */ + type JSON.Number Latitude; + + /** + * @desc Longitude (DATUM=WGS84) -180 to 180 in decimal degree format DDD.ddd + */ + type JSON.Number Longitude; + + /** + * @desc Postal code for the location + */ + type JSON.String PostalCode; + + type record CpInfo_{ + Latitude latitude optional, + Longitude longitude optional, + PostalCode postalCode optional + } + type record of CpInfo_ CpInfo; + + /** + * @desc This type represents the information of the device that is connected to a fixed access network. + * @member timeStamp Time stamp. + * @member gwId Information (typically the serial number) to identify an Internet Gateway Device through which the customer premises device is connected. + * @member deviceId Typically, the serial number of the device. + * @member deviceStatus Current operational status of the device. + * @member upTime Time in seconds since the device was last restarted + * @member iPConnectionUpTime The time in seconds that the IP interface has been connected. + * @member totalBytesSent Total number of IP payload bytes sent since the device was last restarted + * @member totalBytesReceived Total number of IP payload bytes received since the device was last restarted + * @member totalPacketsSent Total number of packets sent since the device was last restarted + * @member totalPacketsReceived Total number of packets received since the device was last restarted + * @member iPPingDiagnostics The result of an IP-layer ping test + * @member traceRouteDiagnostics The result of an IP-layer trace-route test + * @member downloadDiagnostics The result of a HTTP and FTP DownloadDiagnostics Test + * @member uploadDiagnostics The result of a HTTP and FTP UploadDiagnostics Test + */ + type record DeviceInfo { + TimeStamp timeStamp optional, + GatewayId gwId, + DeviceId deviceId optional, + DeviceStatus deviceStatus, + JSON.Number upTime, + JSON.Number iPConnectionUpTime, + JSON.Number totalBytesSent, + JSON.Number totalBytesReceived, + JSON.Number totalPacketsSent, + JSON.Number totalPacketsReceived, + IPPingDiagnostics iPPingDiagnostics optional, + TraceRouteDiagnostics traceRouteDiagnostics optional, + DownloadDiagnostics downloadDiagnostics optional, + UploadDiagnostics uploadDiagnostics optional + } + + /** + * @desc Information (typically the serial number) to identify an Internet Gateway Device through which the customer premises device is connected. + */ + type record of JSON.String GatewayId; + + /** + * @desc Typically, the serial number of the device. + */ + type record of JSON.String DeviceId; + + /** + * @desc Current operational status of the device. + */ + type enumerated DeviceStatus { + Up, + Initializing, + Error, + Disabled + } + + type record IPPingDiagnostics {} + type record TraceRouteDiagnostics {} + type record DownloadDiagnostics{} + type record UploadDiagnostics {} + + /** + * @desc This type represents the information of the cable line of a fixed access network + * @member timeStamp Time stamp. + * @member customerPremisesInfo The physical location of a customer site. + * + */ + type record CableLineInfo { + TimeStamp timeStamp optional, + CpInfo customerPremisesInfo, + CmdInfo cmdInfo + } + + /** + * @desc + * @member cmdId Information (typically the serial number) to identify a Cable Modem at subscriber locations intended for use in conveying data communications on a cable data system. + * @member cmStatus It provides CM connectivity status information of the CM. + * @member cmDpvStats It represents the DOCSIS Path Verify Statistics collected in the cable modem device. + * @member serviceFlowStats It describes statistics associated with the Service Flows in a managed device. + */ + type record CmdInfo_ { + CmdId cmdId, + CmStatus cmStatus optional, + CmDpvStats cmDpvStats optional, + ServiceFlowStats serviceFlowStats optional + } + type record of CmdInfo_ CmdInfo; + + /** + * @desc Information (typically the serial number) to identify a Cable Modem at subscriber locations intended for use in conveying data communications on a cable data system. + */ + type JSON.String CmdId; + + /** + * @desc It provides CM connectivity status information of the CM. + * @member ifIndex It denotes the MAC Domain interface index of the CM. + * @member It defines the CM connectivity state. + * @member resets It denotes the number of times the CM reset or initialized this interface. + * @member lostSyncs It denotes the number of times the CM lost synchronization with the downstream channel. + * @member invalidRegRsps It denotes the number of times the CM received invalid registration response messages. + * @member energyMgt1x1OperStatus It indicates whether the CM is currently operating in Energy Management 1x1 Mode + * @member emDlsOperStatus It indicates whether the CM is currently operating in Energy Management DLS Mode + */ + type record CmStatus_ { + IfIndex ifIndex, + CmRegState cmRegState, + JSON.Number resets, + JSON.Number lostSyncs, + JSON.Number invalidRegRsps, + JSON.Bool energyMgt1x1OperStatus, + JSON.Bool emDlsOperStatus + } + type record of CmStatus_ CmStatus; + + /** + * @desc It denotes the MAC Domain interface index of the CM. + */ + type JSON.String IfIndex; + + /** + * @desc It defines the CM connectivity state. + */ + type enumerated CmRegState { + other, + notReady, + notSynchronized, + phySynchronized, + usParametersAcquired, + rangingComplete, + dhcpV4Complete, + todEstablished, + securityEstablished, + configFileDownloadComplete, + registrationComplete, + operational, + accessDenied, + eaeInProgress, + dhcpv4InProgress, + dhcpv6InProgress, + dhcpV6Complete, + registrationInProgress, + bpiInit, + forwardingDisabled, + dsTopologyResolutionInProgress, + rangingInProgress, + rfMuteAll + } + + /** + * @desc It represents the DOCSIS Path Verify Statistics collected in the cable modem device. + * @member ifIndex It denotes the MAC Domain interface index of the CM. + * @member lastMeasLatency The last latency measurement. + * @member lastMeasTime the last measurement time of the last latency measurement. + * @member minLatency the minimum latency measurement. + * @member maxLatency the maximum latency measurement. + * @member avgLatency the average latency measurement. + * @member numMeas The number of latency measurements made. + */ + type record CmDpvStats_ { + IfIndex ifIndex, + JSON.Number lastMeasLatency, + TimeStamp lastMeasTime, + JSON.Number minLatency, + JSON.Number maxLatency, + JSON.Number avgLatency, + JSON.Number numMeas + } + type record of CmDpvStats_ CmDpvStats; + + /** + * @desc It describes statistics associated with the Service Flows in a managed device. + * @member ifIndex It denotes the MAC Domain interface index of the CM. + * @member serviceFlowInfo It represents the information of a Service Flow. + */ + type record ServiceFlowStats_ { + IfIndex ifIndex, + ServiceFlowInfo serviceFlowInfo + } + type record of ServiceFlowStats_ ServiceFlowStats; + + /** + * @desc It represents the information of a Service Flow. + * @member ifIndex It denotes the MAC Domain interface index of the CM. + * @member serviceFlowId It represents an identifier assigned to a Service Flow by CMTS within a MAC Domain. + * @member pkts For outgoing Service Flows, this attribute counts the number of Packet Data PDUs forwarded to this Service Flow. For incoming upstream CMTS service flows, this attribute counts the number of Packet Data PDUs actually received on the Service Flow identified by the SID for which the packet was scheduled. + * @member timeCreated It indicates the time when the service flow was created. + * @member timeActiveIt Indicates the number of seconds that the service flow has been active. + * @member policedDropPkts For upstream service flows, this attribute counts the number of Packet Data PDUs classified to this service flow dropped due to: (1) exceeding the selected Buffer Size for the service flow; or (2) UGS packets dropped due to exceeding the Unsolicited Grant Size with a Request/Transmission policy that requires such packets to be dropped. + * @member policedDelayPkts It counts only outgoing packets delayed in order to maintain the Maximum Sustained Traffic Rate. + * @member aqmDroppedPkts For upstream service flows on which AQM is enabled, this attribute counts the number of Packet Data PDUs classified to this service flow dropped due to Active Queue Management drop decisions. + */ + type record ServiceFlowInfo_ { + JSON.Number serviceFlowId, + JSON.Number pkts, + TimeStamp timeCreated, + JSON.Number timeActive, + JSON.Number policedDropPkts, + JSON.Number policedDelayPkts, + JSON.Number aqmDroppedPkts + } + type record of ServiceFlowInfo_ ServiceFlowInfo; + + /** + * @desc This type represents the information of the of an optical network (e.g., G-PON, XG-PON, NG-PON2, XGS-PON). + * @member timeStamp Time stamp. + * @member customerPremisesInfo The physical location of a customer site. + * @member ponSYS_ID The 20-bit identity of the optical system within a certain domain. + * @member opticalNetworkInfo + */ + type record PonInfo { + TimeStamp timeStamp optional, + CpInfo customerPremisesInfo, + PonSYS_ID ponSYS_ID, + OpticalNetworkInfo opticalNetworkInfo + } + + type JSON.String PonSYS_ID; + + /** + * @desc This type represents the information of the of an optical network (e.g., G-PON, XG-PON, NG-PON2, XGS-PON). + * @member onuId Information to identify an Optical Network Unit. + * @member ponTech An informative field identifying the optical technology used. + * @member operationalState It reports whether the ONU is currently capable of performing its function. + * @member dsRate Downstream line rate + * @member usRate Upstream line rate + */ + type record OpticalNetworkInfo_ { + OnuId onuId, + PonTech ponTech, + OperationalState operationalState, + DsRate dsRate, + UsRate usRate + } + type record of OpticalNetworkInfo_ OpticalNetworkInfo; + + /** + * @desc Information to identify an Optical Network Unit. + */ + type JSON.String OnuId; + type record of OnuId OnuIds; + + /** + * @desc An informative field identifying the optical technology used. + */ + type enumerated PonTech { + GPON, + XGPON, + NGPON2, + XGSPON + } + + /** + * @desc It reports whether the ONU is currently capable of performing its function. + */ + type enumerated OperationalState { + enabled, + disabled + } + + /** + * @desc Upstream line rate + */ + type enumerated DsRate { + e_ds_one, // 1 = 2.48832 Gbit/s: G-PON [i.9] or NG-PON2 option 2 [i.8] + e_ds_two // 9.95328 Gbit/s: XG-PON [i.10] or XGS-PON [i.11] or NG-PON2 option 1 [i.8] + } + + /** + * @desc Upstream line rate + */ + type enumerated UsRate { + e_us_one, // 1 = 1.24416 Gbit/s: G-PON option 1 [i.9] + e_us_two, // 2 = 2.48832 Gbit/s: G-PON option 2 [i.9] or XG-PON [i.10] or NG-PON2 option 2 [i.8] + e_us_three // 9.95328 Gbit/s: XGS-PON [i.11] + } + + /** + * @desc Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. + * @member self_ Self referring URI. The URI shall be unique within the FAI API as it acts as an ID for the subscription. + */ + type record Links { + LinkType self_ + } with { + variant (self_) "name as 'self'"; + } + + /** + * @desc This type represents a type of link and may be referenced from data structures. + */ + type record LinkType { + Href href + } + + /** + * @desc URI referring to a resource. + */ + type JSON.String Href; + + /** + * @desc This type represents a list of links related to currently existing subscriptions for the service consumer. + * @member links List of hyperlinks related to the resource. + * @member subscription A link to a subscription. + */ + type record SubscriptionLinkList { + Links links, + Subscriptions subscription optional + } with { + variant (links) "name as '_links'"; + } + + /** + * @desc A link to a subscription + * @member href The URI referring to the subscription. + * @member subscriptionType Type of subscription + */ + type record Subscription_ { + JSON.AnyURI href, + SubscriptionType subscriptionType + } + type record of Subscription_ Subscriptions; + + /** + * @desc Type of subscription + */ + type enumerated SubscriptionType { + RESERVED, + ONU_ALARM, + DEVICE_ABNORMAL_ALERT, + CM_CONNECTIVITY_STATE, + ANI_ALARM + } + + /** + * @desc This type represents a subscription to ONU alarm notifications from FAIS. + */ + type record OnuAlarmSubscription { + JSON.String subscriptionType, + JSON.AnyURI callbackReference, + Links links optional, + FilterCriteriaOnuAlarm filterCriteriaOnuAlarm, + TimeStamp expiryDeadline optional + } with { + variant (links) "name as '_links'"; + } + + /** + * @desc List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response + * @member customerPremisesInfo Physical locations of the customer sites + * @member onuId Unique identifiers for the optical network units. + * @member In case alarms is not included in the subscription request, the default value -1 = All shall be used and included in the response. + */ + type record FilterCriteriaOnuAlarm { + CpInfo customerPremisesInfo optional, + OnuIds onuId, + Alarms alarms optional + } + + /** + * @desc + */ + type enumerated Alarm { + EquipmentAlarm, // (Functional failure on an internal interface) + PoweringAlarm, // (Loss of external power to battery backup unit. This alarm is typically derived through an external interface to a battery backup unit, and indicates that AC is no longer available to maintain battery charge.) + BatteryMissing, // (Battery is provisioned but missing) + BatteryFailure, // (Battery is provisioned and present but cannot recharge) + BatteryLow, // (Battery is provisioned and present but its voltage is too low) + PhysicalIntrusion, // (Applies if the ONU supports detection such as door or box open) + OnuSelfTestFailure, // (ONU has failed autonomous self-test) + DyingGasp, // ()ONU is powering off imminently due to loss of power to the ONU itself.) + TemperatureYellow, // (No service shutdown at present, but the circuit pack is operating beyond its recommended range.) + TemperatureRed, // ()Some services have been shut down to avoid equipment damage.) + VoltageYellow, // (No service shutdown at present, but the line power voltage is below its recommended minimum.) + VoltageRed, // (Some services have been shut down to avoid power collapse.) + OnuManualPowerOff, // (The ONU is shutting down because the subscriber has turned off its power switch.) + InvImage, // (Software image is invalid) + PseOverloadYellow, // (Indicates that the ONU is nearing its maximum ability to supply the known PoE demand of the attached PDs. The thresholds for declaring and clearing this alarm are vendor-specific.) + PseOverloadRed, //(Indicates that the ONU is unable to supply all of the PoE demand of the attached PDs and has removed or reduced power to at least one PD.) + All + } + type record of Alarm Alarms; + +} // End of module FixedAccessInformationServiceAPI_TypesAndValues diff --git a/ttcn/LibMec/Grant/ttcn/Grant_Pixits.ttcn b/ttcn/LibMec/Grant/ttcn/Grant_Pixits.ttcn index 01533399791c9b43c3c064942f3fb76165bd4023..0b679bc869d20053b0bc6c4836de09c7210d4959 100644 --- a/ttcn/LibMec/Grant/ttcn/Grant_Pixits.ttcn +++ b/ttcn/LibMec/Grant/ttcn/Grant_Pixits.ttcn @@ -6,15 +6,14 @@ module Grant_Pixits { // LibMec/LocationAPI import from Grant_TypesAndValues all; - modulepar JSON.String PX_APP_INSTANCE_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f" + modulepar JSON.String PX_APP_INSTANCE_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f"; - modulepar Operation_type PX_APP_OPERATION := INSTANTIATE + modulepar Operation_type PX_APP_OPERATION := INSTANTIATE; - modulepar Operation_type_error PX_APP_OPERATION_ERROR := INSTANTIATE + modulepar Operation_type_error PX_APP_OPERATION_ERROR := INSTANTIATE; - modulepar JSON.String PX_GRANTING_ID := "e0deee2b-6e50-4f33-ab09-8bf0585025d3" + modulepar JSON.String PX_GRANTING_ID := "e0deee2b-6e50-4f33-ab09-8bf0585025d3"; - modulepar JSON.String PX_NON_EXISTANT_GRANTING_ID := "PX_NON_EXISTANT_GRANTING_ID" - + modulepar JSON.String PX_NON_EXISTANT_GRANTING_ID := "PX_NON_EXISTANT_GRANTING_ID"; } diff --git a/ttcn/LibMec/Grant/ttcn/Grant_Templates.ttcn b/ttcn/LibMec/Grant/ttcn/Grant_Templates.ttcn index da89f69760a93d3495c537978ff818138ed503e3..fd87f043ddf432330e536f2117057e0fd72b6257 100644 --- a/ttcn/LibMec/Grant/ttcn/Grant_Templates.ttcn +++ b/ttcn/LibMec/Grant/ttcn/Grant_Templates.ttcn @@ -33,206 +33,4 @@ module Grant_Templates { operation := p_app_operation } -// template (omit) AppMobilityServiceInfo m_app_mobility_service_info( -// in String p_app_mobility_service_id := PX_APP_MOBILITY_SERVICE_ID, -// in template (omit) RegistrationInfos p_registration_info := omit -// ) := { -// registeredAppMobilityService := p_registration_info, -// appMobilityServiceId := p_app_mobility_service_id -// } // End of template m_app_mobility_service_info -// -// -// template (present) AppMobilityServiceInfo mw_app_mobility_service_info( -// template (present) RegistrationInfos p_registration_info := ?, -// template (present) String p_app_mobility_service_id := ? -// ) := { -// registeredAppMobilityService := p_registration_info, -// appMobilityServiceId := p_app_mobility_service_id -// } -// -// template (omit) RegistrationInfo m_app_mobility_registration_info( -// in template (value) ServiceConsumerId p_serviceConsumerId, -// in template (omit) DeviceInformations p_deviceInformation := omit, -// in template (omit) UInt32 p_expiryTime := omit -// ) := { -// serviceConsumerId := p_serviceConsumerId, -// deviceInformation := p_deviceInformation, -// expiryTime := p_expiryTime -// } -// -// template RegistrationInfo mw_app_mobility_registration_info( -// template (present) ServiceConsumerId p_serviceConsumerId := ?, -// template DeviceInformations p_deviceInformation := *, -// template UInt32 p_expiryTime := * -// ) := { -// serviceConsumerId := p_serviceConsumerId, -// deviceInformation := p_deviceInformation, -// expiryTime := p_expiryTime -// } -// -// template (omit) ServiceConsumerId m_service_consumer_id( -// in template (omit) String p_appInstanceId := omit, -// in template (omit) String p_mepId := omit -// ) := { -// appInstanceId := p_appInstanceId, -// mepId := p_mepId -// } -// -// template ServiceConsumerId mw_service_consumer_id( -// template String p_appInstanceId := *, -// template String p_mepId := * -// ) := { -// appInstanceId := p_appInstanceId, -// mepId := p_mepId -// } -// -// template (omit) RegistrationRequest m_registration_request ( -// in template (omit) ServiceConsumerId p_service_consumer_id := omit, -// in template (omit) DeviceInformations p_device_info := omit, -// in UInt32 p_expire_time -// ) := { -// serviceConsumerId := p_service_consumer_id, -// deviceInformation := p_device_info, -// expiryTime := p_expire_time -// } -// -// template RegistrationRequest mw_registration_request( -// template ServiceConsumerId p_service_consumer_id := ?, -// template DeviceInformations p_device_info := omit, -// template UInt32 p_expire_time := omit -// ) := { -// serviceConsumerId := p_service_consumer_id, -// deviceInformation := p_device_info, -// expiryTime := p_expire_time -// } -// -// -// template (value) RegistrationInfo m_registration_info ( -// in template (omit) ServiceConsumerId p_service_consumer_id := omit, -// in template (omit) DeviceInformations p_device_info := omit, -// in UInt32 p_expire_time -// ) := { -// serviceConsumerId := p_service_consumer_id, -// deviceInformation := p_device_info, -// expiryTime := p_expire_time -// } -// -// template (present) RegistrationInfo mw_registration_info( -// template (present) ServiceConsumerId p_service_consumer_id := ?, -// template (present) DeviceInformations p_device_info := ?, -// template (present) UInt32 p_expire_time -// ) := { -// serviceConsumerId := p_service_consumer_id, -// deviceInformation := p_device_info, -// expiryTime := p_expire_time -// } -// -// -// template (value) ServiceConsumer m_service_consumer ( -// in String p_app_instance, -// in String p_mep_id -// ) := { -// appInstance := p_app_instance, -// mepId := p_mep_id -// } -// -// template (value) DeviceInformation m_device_info ( -// in String p_associate_id -// ) := { -// associateId := p_associate_id -// } -// -// template (omit) DeviceInformation mw_device_info ( -// in String p_associate_id -// ) := { -// associateId := p_associate_id -// } -// type record AmsSubscriptionLinkList { -// JSON.AnyURI links, -// Subscription subscription -// } -// -// -// -// template (value) MobilityProcedureSubscription m_ams_subscription ( -// in SubscriptionType p_subscriptionType, -// in JSON.AnyURI p_callbackReference, -// in JSON.AnyURI p_links, -// in FilterCriteria p_filterCriteria, -// in TimeStamp p_expiryDeadline -// -// ) := { -// subscriptionType := p_subscriptionType , -// callbackReference := p_callbackReference, -// links := p_links, -// filterCriteria := p_filterCriteria, -// expiryDeadline := p_expiryDeadline -// } -// -// -// template (value) MobilityProcedureSubscriptionError m_ams_subscription_error ( -// in SubscriptionType p_subscriptionType, -// in JSON.AnyURI p_callbackReference, -// in JSON.AnyURI p_links, -// in FilterCriteria p_filterCriteria, -// in TimeStamp p_expiryDeadline -// -// ) := { -// subscriptionType := p_subscriptionType, -// callbackReference := p_callbackReference, -// links := p_links, -// filterCriteria := p_filterCriteria, -// expiryDeadline := p_expiryDeadline -// } -// -// template (present) MobilityProcedureSubscription mw_ams_subscription ( -// in SubscriptionType p_subscriptionType, -// in JSON.AnyURI p_callbackReference, -// in JSON.AnyURI p_links, -// in FilterCriteria p_filterCriteria, -// in TimeStamp p_expiryDeadline -// ) := { -// subscriptionType := p_subscriptionType , -// callbackReference := p_callbackReference, -// links := p_links, -// filterCriteria := p_filterCriteria, -// expiryDeadline := p_expiryDeadline -// } -// -// -// -// template (value) ProblemDetails m_problem_details( -// in JSON.String p_type, -// in JSON.String p_title, -// in UInt32 p_status, -// in JSON.String p_detail, -// in JSON.String p_instance -// ) := { -// type_ := p_type, -// title := p_title, -// status := p_status, -// detail := p_detail, -// instance := p_instance -// } // End of template m_problem_details -// -// template (present) ProblemDetails mw_problem_details( -// template (present) JSON.String p_type := ?, -// template (present) JSON.String p_title := ?, -// template (present) UInt32 p_status := ?, -// template (present) JSON.String p_detail := ?, -// template (present) JSON.String p_instance := ? -// ) := { -// type_ := p_type, -// title := p_title, -// status := p_status, -// detail := p_detail, -// instance := p_instance -// } // End of template mw_problem_details -// -// - - - - - } // End of module LocationAPI_Templates diff --git a/ttcn/LibMec/LocationAPI/ttcn/LocationAPI_Pixits.ttcn b/ttcn/LibMec/LocationAPI/ttcn/LocationAPI_Pixits.ttcn index 0bdde66ffa84c350437594955f13c84e3fc84c0c..9b7e86c9298921dd5552c2a51b3a0e0158953a21 100644 --- a/ttcn/LibMec/LocationAPI/ttcn/LocationAPI_Pixits.ttcn +++ b/ttcn/LibMec/LocationAPI/ttcn/LocationAPI_Pixits.ttcn @@ -51,24 +51,12 @@ module LocationAPI_Pixits { modulepar Address PX_ACR_UNKNOWN_IP := ""; - modulepar Address PX_UE_ZONAL_TRAF_SUB_URI := ""; - - modulepar JSON.AnyURI PX_UE_LOC_QRY_URI := ""; - modulepar JSON.Number PX_UE_COORD_LAT := 0.0; modulepar JSON.Number PX_UE_COORD_LONG := 0.0; - modulepar JSON.AnyURI PX_UE_LOC_USERS_URI := ""; - modulepar Address PX_ACR_SOME_IP := ""; - modulepar JSON.AnyURI PX_UE_DIST_SUB_URI := ""; - - modulepar JSON.AnyURI PX_UE_PERIODIC_SUB_URI := ""; - - modulepar JSON.AnyURI PX_UE_LOC_USERTRACK_SUB_URI := ""; - modulepar CallbackReference PX_USERTRACK_SUB_CALLBACK_URI := { "" }; modulepar CallbackReference PX_TRAFFIC_SUB_CALLBACK_URI := { "" }; diff --git a/ttcn/LibMec/LocationAPI/ttcn/LocationAPI_TypesAndValues.ttcn b/ttcn/LibMec/LocationAPI/ttcn/LocationAPI_TypesAndValues.ttcn index c16b1f7d2ad3a44b81ca0375e4657c75cb27dffc..08bc78f4500e600c63f9792b86c8263998f109db 100644 --- a/ttcn/LibMec/LocationAPI/ttcn/LocationAPI_TypesAndValues.ttcn +++ b/ttcn/LibMec/LocationAPI/ttcn/LocationAPI_TypesAndValues.ttcn @@ -117,7 +117,7 @@ module LocationAPI_TypesAndValues { /** * @desc Address of user (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI). */ - type JSON.String Address + type JSON.String Address; /** * @desc Reserved for future use. diff --git a/ttcn/LibMec/MeoPkgm/ttcn/MeoPkgm_Pixits.ttcn b/ttcn/LibMec/MeoPkgm/ttcn/MeoPkgm_Pixits.ttcn index 55ed740aa749cd81922399b1b674fe7fb3bee6e8..f775a510182cf1100b66b671c08b84311f3876c2 100644 --- a/ttcn/LibMec/MeoPkgm/ttcn/MeoPkgm_Pixits.ttcn +++ b/ttcn/LibMec/MeoPkgm/ttcn/MeoPkgm_Pixits.ttcn @@ -2,49 +2,36 @@ module MeoPkgm_Pixits { // JSON import from JSON all; - + // LibMec/LocationAPI import from MeoPkgm_TypesAndValues all; - modulepar JSON.String PX_APP_PKG_NAME := "APP_PKG_NAME" + modulepar JSON.String PX_APP_PKG_NAME := "APP_PKG_NAME"; - modulepar JSON.String PX_APP_PKG_VERSION := "APP_PKG_VERSION" + modulepar JSON.String PX_APP_PKG_VERSION := "APP_PKG_VERSION"; - modulepar JSON.String PX_CHECKSUM := "CHECKSUM" + modulepar JSON.String PX_CHECKSUM := "CHECKSUM"; - modulepar JSON.String PX_APP_PKG_PATH := "APP_PKG_PATH" + modulepar JSON.String PX_APP_PKG_PATH := "APP_PKG_PATH"; - modulepar OperationalState PX_OPERATIONAL_STATE := ENABLED + modulepar OperationalState PX_OPERATIONAL_STATE := ENABLED; - modulepar UsageState PX_USAGE_STATE := NOT_IN_USE + modulepar UsageState PX_USAGE_STATE := NOT_IN_USE; - modulepar JSON.String PX_ON_BOARDED_APP_PKG_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f" + modulepar JSON.String PX_ON_BOARDED_APP_PKG_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f"; - modulepar JSON.String PX_NON_EXISTENT_APP_PKG_ID := "NON_EXISTENT_APP_PKG_ID" + modulepar JSON.String PX_NON_EXISTENT_APP_PKG_ID := "NON_EXISTENT_APP_PKG_ID"; - modulepar JSON.AnyURI PX_CALLBACK_URI := "http://127.0.0.1/callback" + modulepar JSON.AnyURI PX_CALLBACK_URI := "http://127.0.0.1/callback"; - modulepar SubscriptionType PX_SUBSCRIPTION_TYPE := ON_BOARDING + modulepar SubscriptionType PX_SUBSCRIPTION_TYPE := ON_BOARDING; - modulepar SubscriptionTypeWithError PX_SUBSCRIPTION_TYPE_WITH_ERROR := ONBOARDING + modulepar SubscriptionTypeWithError PX_SUBSCRIPTION_TYPE_WITH_ERROR := ONBOARDING; - modulepar JSON.String PX_SUBSCRIPTION_ID := "e0deee2b-6e50-4f33-ab09-8bf0585025d3" + modulepar JSON.String PX_SUBSCRIPTION_ID := "e0deee2b-6e50-4f33-ab09-8bf0585025d3"; - modulepar JSON.String PX_NON_EXISTENT_SUBSCRIPTION_ID := "NON_EXISTENT_SUBSCRIPTION_ID" + modulepar JSON.String PX_NON_EXISTENT_SUBSCRIPTION_ID := "NON_EXISTENT_SUBSCRIPTION_ID"; - modulepar NotificationType PX_NOTIFICATION_TYPE := ON_BOARDING - -// modulepar JSON.String PX_APP_MOBILITY_SERVICE_ID := "KtRGymNQ84dG3mQfRepa" -// -// modulepar JSON.String PX_APP_INS_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f" -// -// modulepar SubscriptionType PX_SUBSCRIPTION_TYPE := MobilityProcedureSubscription -// -// -// -// modulepar JSON.String PX_CALLBACK_REFERENCE := "http://127.0.0.1/callback" -// -// -// modulepar JSON.String PX_MEP_ID := ""; + modulepar NotificationType PX_NOTIFICATION_TYPE := ON_BOARDING; } // End of module LocationAPI_Pixits diff --git a/ttcn/LibMec/MeoPkgm/ttcn/MeoPkgm_Templates.ttcn b/ttcn/LibMec/MeoPkgm/ttcn/MeoPkgm_Templates.ttcn index fcbff08601e60d199ad0fb7e032e212bd79802af..69aa9c446dc6462fbdebb1463250e426f2197b2e 100644 --- a/ttcn/LibMec/MeoPkgm/ttcn/MeoPkgm_Templates.ttcn +++ b/ttcn/LibMec/MeoPkgm/ttcn/MeoPkgm_Templates.ttcn @@ -81,271 +81,5 @@ module MeoPkgm_Templates { subscriptionId := p_subscriptionId, links := p_links } - - - -// template (omit) AppMobilityServiceInfo m_app_mobility_service_info( -// in String p_app_mobility_service_id := PX_APP_MOBILITY_SERVICE_ID, -// in template (omit) RegistrationInfos p_registration_info := omit -// ) := { -// registeredAppMobilityService := p_registration_info, -// appMobilityServiceId := p_app_mobility_service_id -// } // End of template m_app_mobility_service_info -// -// -// template (present) AppMobilityServiceInfo mw_app_mobility_service_info( -// template (present) RegistrationInfos p_registration_info := ?, -// template (present) String p_app_mobility_service_id := ? -// ) := { -// registeredAppMobilityService := p_registration_info, -// appMobilityServiceId := p_app_mobility_service_id -// } -// -// template (omit) RegistrationInfo m_app_mobility_registration_info( -// in template (value) ServiceConsumerId p_serviceConsumerId, -// in template (omit) DeviceInformations p_deviceInformation := omit, -// in template (omit) UInt32 p_expiryTime := omit -// ) := { -// serviceConsumerId := p_serviceConsumerId, -// deviceInformation := p_deviceInformation, -// expiryTime := p_expiryTime -// } -// -// template RegistrationInfo mw_app_mobility_registration_info( -// template (present) ServiceConsumerId p_serviceConsumerId := ?, -// template DeviceInformations p_deviceInformation := *, -// template UInt32 p_expiryTime := * -// ) := { -// serviceConsumerId := p_serviceConsumerId, -// deviceInformation := p_deviceInformation, -// expiryTime := p_expiryTime -// } -// -// template (omit) ServiceConsumerId m_service_consumer_id( -// in template (omit) String p_appInstanceId := omit, -// in template (omit) String p_mepId := omit -// ) := { -// appInstanceId := p_appInstanceId, -// mepId := p_mepId -// } -// -// template (omit) ServiceConsumer m_service_consumer_error( -// in template (omit) String p_appInstance := omit, -// in template (omit) String p_mepId := omit -// ) := { -// appInstance := p_appInstance, -// mepId := p_mepId -// } -// -// template ServiceConsumerId mw_service_consumer_id( -// template String p_appInstanceId := *, -// template String p_mepId := * -// ) := { -// appInstanceId := p_appInstanceId, -// mepId := p_mepId -// } -// -// template (omit) RegistrationRequest m_registration_request ( -// in template (omit) ServiceConsumerId p_service_consumer_id := omit, -// in template (omit) DeviceInformations p_device_info := omit, -// in template (omit) UInt32 p_expire_time := omit -// ) := { -// serviceConsumerId := p_service_consumer_id, -// deviceInformation := p_device_info, -// expiryTime := p_expire_time -// } -// -// -// template (omit) RegistrationRequest m_registration_request_error ( -// in template (omit) ServiceConsumer p_service_consumer := omit, -// in template (omit) DeviceInformations p_device_info := omit, -// in template (omit) UInt32 p_expire_time := omit -// ) := { -// serviceConsumerId := p_service_consumer, -// deviceInformation := p_device_info, -// expiryTime := p_expire_time -// } -// -// -// template RegistrationRequest mw_registration_request( -// template ServiceConsumerId p_service_consumer_id := ?, -// template DeviceInformations p_device_info := omit, -// template UInt32 p_expire_time := omit -// ) := { -// serviceConsumerId := p_service_consumer_id, -// deviceInformation := p_device_info, -// expiryTime := p_expire_time -// } -// -// -// template (value) RegistrationInfo m_registration_info ( -// in template (omit) ServiceConsumerId p_service_consumer_id := omit, -// in template (omit) DeviceInformations p_device_info := omit, -// in UInt32 p_expire_time -// ) := { -// serviceConsumerId := p_service_consumer_id, -// deviceInformation := p_device_info, -// expiryTime := p_expire_time -// } -// -// template (present) RegistrationInfos mw_registration_info( -// template (present) ServiceConsumerId p_service_consumer_id := ?, -// template (present) DeviceInformations p_device_info := ?, -// template (present) UInt32 p_expire_time := ? -// ) := { -// -// } -// -// -// template (value) ServiceConsumer m_service_consumer ( -// in String p_app_instance, -// in String p_mep_id -// ) := { -// appInstance := p_app_instance, -// mepId := p_mep_id -// } -// -// template (omit) ServiceConsumer mw_service_consumer ( -// in String p_app_instance, -// in template (omit) String p_mep_id := omit -// ) := { -// appInstance := p_app_instance, -// mepId := p_mep_id -// } -// -// template (value) DeviceInformation m_device_info ( -// in String p_associate_id -// ) := { -// associateId := p_associate_id -// } -// -// template (omit) DeviceInformation mw_device_info ( -// in String p_associate_id -// ) := { -// associateId := p_associate_id -// } -// type record AmsSubscriptionLinkList { -// JSON.AnyURI links, -// Subscription subscription -// } -// -// template (value) AdjacentAppInfoSubscription mw_adjacent_application_info_notification ( -// in template (omit) SubscriptionType p_subscriptionType := omit, -// in JSON.AnyURI p_callbackReference, -// in template (omit) JSON.AnyURI p_links := omit, -// in template (omit) AdjacentFilterCriteria p_filterCriteria := omit, -// in template (omit) TimeStamp p_expiryDeadline := omit -// -// ) := { -// subscriptionType := p_subscriptionType , -// callbackReference := p_callbackReference, -// links := p_links, -// filterCriteria := p_filterCriteria, -// expiryDeadline := p_expiryDeadline -// } -// -// -// template (value) MobilityProcedureSubscription m_ams_subscription ( -// in SubscriptionType p_subscriptionType := PX_SUBSCRIPTION_TYPE, -// in JSON.AnyURI p_callbackReference, -// in template (omit) JSON.AnyURI p_links := omit, -// in template (omit) FilterCriteria p_filterCriteria := omit, -// in template (omit) TimeStamp p_expiryDeadline := omit -// -// ) := { -// subscriptionType := p_subscriptionType , -// callbackReference := p_callbackReference, -// links := p_links, -// filterCriteria := p_filterCriteria, -// expiryDeadline := p_expiryDeadline -// } -// -// -// -// template (value) MobilityProcedureSubscription mw_mobility_procedure_notification ( -// in template (omit) SubscriptionType p_subscriptionType := omit, -// in JSON.AnyURI p_callbackReference, -// in template (omit) JSON.AnyURI p_links := omit, -// in template (omit) FilterCriteria p_filterCriteria := omit, -// in template (omit) TimeStamp p_expiryDeadline := omit -// -// ) := { -// subscriptionType := p_subscriptionType , -// callbackReference := p_callbackReference, -// links := p_links, -// filterCriteria := p_filterCriteria, -// expiryDeadline := p_expiryDeadline -// } -// -// template (value) MobilityProcedureSubscriptionError m_ams_subscription_error ( -// in SubscriptionType p_subscriptionType, -// in JSON.AnyURI p_callbackReference, -// in template (omit) JSON.AnyURI p_links := omit, -// in template (omit) FilterCriteria p_filterCriteria := omit, -// in template (omit) TimeStamp p_expiryDeadline := omit -// -// ) := { -// subscriptionType := p_subscriptionType, -// callbackReference := p_callbackReference, -// links := p_links, -// filterCriteria := p_filterCriteria, -// expiryDeadline := p_expiryDeadline -// } -// -// template (present) MobilityProcedureSubscription mw_ams_subscription ( -// in SubscriptionType p_subscriptionType, -// in template (omit) JSON.AnyURI p_callbackReference := omit, -// in template (omit) JSON.AnyURI p_links := omit, -// in template (omit) FilterCriteria p_filterCriteria := omit, -// in template (omit) TimeStamp p_expiryDeadline := omit -// ) := { -// subscriptionType := p_subscriptionType , -// callbackReference := p_callbackReference, -// links := p_links, -// filterCriteria := p_filterCriteria, -// expiryDeadline := p_expiryDeadline -// } -// -// template (present) ExpiryNotification mw_expire_notification ( -// in template (omit) TimeStamp p_timestamp := omit, -// in template (omit) JSON.AnyURI p_links := omit, -// in TimeStamp p_expiryDeadline -// ) := { -// timeStamp := p_timestamp, -// links := p_links, -// expiryDeadline := p_expiryDeadline -// } -// -// -// -// template (value) ProblemDetails m_problem_details( -// in JSON.String p_type, -// in JSON.String p_title, -// in UInt32 p_status, -// in JSON.String p_detail, -// in JSON.String p_instance -// ) := { -// type_ := p_type, -// title := p_title, -// status := p_status, -// detail := p_detail, -// instance := p_instance -// } // End of template m_problem_details -// -// template (present) ProblemDetails mw_problem_details( -// template (present) JSON.String p_type := ?, -// template (present) JSON.String p_title := ?, -// template (present) UInt32 p_status := ?, -// template (present) JSON.String p_detail := ?, -// template (present) JSON.String p_instance := ? -// ) := { -// type_ := p_type, -// title := p_title, -// status := p_status, -// detail := p_detail, -// instance := p_instance -// } // End of template mw_problem_details - - } // End of module LocationAPI_Templates diff --git a/ttcn/LibMec/MeoPkgm/ttcn/MeoPkgm_TypesAndValues.ttcn b/ttcn/LibMec/MeoPkgm/ttcn/MeoPkgm_TypesAndValues.ttcn index b60e8f6cf0962bd1406e471c391c6c141370bce1..f747b979d3929af47e9598631cb67fcb3e402cf6 100644 --- a/ttcn/LibMec/MeoPkgm/ttcn/MeoPkgm_TypesAndValues.ttcn +++ b/ttcn/LibMec/MeoPkgm/ttcn/MeoPkgm_TypesAndValues.ttcn @@ -90,128 +90,7 @@ type record AppPkgNotification { //@TODO: links shuld be a record, but cannot contain self cause self is a key for ttnc JSON.AnyURI links } - - -// -// -//type record of AppMobilityServiceInfo AppMobilityServiceInfos; -//type record AppMobilityServiceInfo { -// RegistrationInfos registeredAppMobilityService , -// String appMobilityServiceId -//} -// -//type record of RegistrationInfo RegistrationInfos; -//type record RegistrationInfo { -// ServiceConsumerId serviceConsumerId, -// DeviceInformations deviceInformation optional, -// UInt32 expiryTime optional -//} -// -// -// -// -// -//type record of ServiceConsumerId ServiceConsumerIds; -//type record ServiceConsumerId { -// String appInstanceId optional, -// String mepId optional -//} -// -//// Erroneous parameter: appInstance should be appInstanceId -//type record of ServiceConsumer ServiceConsumers; -//type record ServiceConsumer { -// String appInstance optional, -// String mepId optional -//} -// -//type record of DeviceInformation DeviceInformations; -//type record DeviceInformation { -// String associateId -//} -// -// -//type JSON.AnyURI links; -// -//type enumerated SubscriptionType { -// MobilityProcedureSubscription, -// AdjacentAppInfoSubscription -//} -// -//type record Subscription { -// JSON.AnyURI href, -// SubscriptionType subscriptionType -//} -// -// -//type record of AmsSubscriptionLinkList AmsSubscriptionLinkLists; -//type record AmsSubscriptionLinkList { -// JSON.AnyURI links, -// Subscription subscription -//} -// -// -//type record MobilityProcedureSubscriptionError { -// SubscriptionType subscriptionType, -// JSON.AnyURI callbackReference, -// JSON.AnyURI links optional, -// FilterCriteria filterCriteria, -// TimeStamp expiryDeadline optional -//} -// -// -// -// -//type record of MobilityProcedureSubscription MobilityProcedureSubscriptions; -//type record MobilityProcedureSubscription { -// SubscriptionType subscriptionType, -// JSON.AnyURI callbackReference, -// JSON.AnyURI links optional, -// FilterCriteria filterCriteria, -// TimeStamp expiryDeadline optional -//} -// -//type enumerated MobilityStatusType { -// INTERHOST_MOVEOUT_TRIGGERED, -// TARGET_APPINST_CONFIRMED, -// TARGET_TRAFFIC_RULE_ACTIVATED, -// INTERHOST_MOVEOUT_COMPLETED, -// INTERHOST_MOVEOUT_FAILED -//} -// -//type record AssociateIdList { -// String associateId -//} -// -//type record of FilterCriteria FilterCriterias; -//type record FilterCriteria { -// String appInstanceId optional, -// AssociateIdList associateId optional, -// MobilityStatusType mobilityStatus -//} -// -// -// -//type record AdjacentFilterCriteria { -// String appInstanceId optional -//} -// -// -//type record of ExpiryNotification ExpiryNotifications; -//type record ExpiryNotification { -// TimeStamp timeStamp, -// JSON.AnyURI links optional, -// TimeStamp expiryDeadline -//} -// -//type record of AdjacentAppInfoSubscription AdjacentAppInfoSubscriptions; -//type record AdjacentAppInfoSubscription { -// SubscriptionType subscriptionType, -// JSON.AnyURI callbackReference, -// JSON.AnyURI links optional, -// AdjacentFilterCriteria filterCriteria, -// TimeStamp expiryDeadline optional -//} - + /** * @desc * @member seconds The seconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC diff --git a/ttcn/LibMec/MepmPkgm/ttcn/MepmPkgm_Pixits.ttcn b/ttcn/LibMec/MepmPkgm/ttcn/MepmPkgm_Pixits.ttcn index 34dcc5a59881a4cc967cb96909429faedfc77926..3c6d34ffb20cfda0b36a251b9be9cfdf9777f02e 100644 --- a/ttcn/LibMec/MepmPkgm/ttcn/MepmPkgm_Pixits.ttcn +++ b/ttcn/LibMec/MepmPkgm/ttcn/MepmPkgm_Pixits.ttcn @@ -6,47 +6,34 @@ module MepmPkgm_Pixits { // LibMec/LocationAPI import from MepmPkgm_TypesAndValues all; - modulepar JSON.String PX_APP_PKG_NAME := "APP_PKG_NAME" + modulepar JSON.String PX_APP_PKG_NAME := "APP_PKG_NAME"; - modulepar JSON.String PX_APP_PKG_VERSION := "APP_PKG_VERSION" + modulepar JSON.String PX_APP_PKG_VERSION := "APP_PKG_VERSION"; - modulepar JSON.String PX_CHECKSUM := "CHECKSUM" + modulepar JSON.String PX_CHECKSUM := "CHECKSUM"; - modulepar JSON.String PX_APP_PKG_PATH := "APP_PKG_PATH" + modulepar JSON.String PX_APP_PKG_PATH := "APP_PKG_PATH"; - modulepar OperationalState PX_OPERATIONAL_STATE := ENABLED + modulepar OperationalState PX_OPERATIONAL_STATE := ENABLED; - modulepar UsageState PX_USAGE_STATE := NOT_IN_USE + modulepar UsageState PX_USAGE_STATE := NOT_IN_USE; - modulepar JSON.String PX_ON_BOARDED_APP_PKG_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f" + modulepar JSON.String PX_ON_BOARDED_APP_PKG_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f"; - modulepar JSON.String PX_NON_EXISTENT_APP_PKG_ID := "NON_EXISTENT_APP_PKG_ID" + modulepar JSON.String PX_NON_EXISTENT_APP_PKG_ID := "NON_EXISTENT_APP_PKG_ID"; - modulepar JSON.AnyURI PX_CALLBACK_URI := "http://127.0.0.1/callback" + modulepar JSON.AnyURI PX_CALLBACK_URI := "http://127.0.0.1/callback"; - modulepar SubscriptionType PX_SUBSCRIPTION_TYPE := ON_BOARDING + modulepar SubscriptionType PX_SUBSCRIPTION_TYPE := ON_BOARDING; - modulepar SubscriptionTypeWithError PX_SUBSCRIPTION_TYPE_WITH_ERROR := ONBOARDING + modulepar SubscriptionTypeWithError PX_SUBSCRIPTION_TYPE_WITH_ERROR := ONBOARDING; - modulepar JSON.String PX_SUBSCRIPTION_ID := "e0deee2b-6e50-4f33-ab09-8bf0585025d3" + modulepar JSON.String PX_SUBSCRIPTION_ID := "e0deee2b-6e50-4f33-ab09-8bf0585025d3"; - modulepar JSON.String PX_NON_EXISTENT_SUBSCRIPTION_ID := "NON_EXISTENT_SUBSCRIPTION_ID" + modulepar JSON.String PX_NON_EXISTENT_SUBSCRIPTION_ID := "NON_EXISTENT_SUBSCRIPTION_ID"; - modulepar NotificationType PX_NOTIFICATION_TYPE := ON_BOARDING + modulepar NotificationType PX_NOTIFICATION_TYPE := ON_BOARDING; - modulepar JSON.String PX_APP_D_ID := "5lkj4782-2c70-4e47-9a4e-0ee3a1a0fd1f" - - -// modulepar JSON.String PX_APP_MOBILITY_SERVICE_ID := "KtRGymNQ84dG3mQfRepa" -// -// -// modulepar SubscriptionType PX_SUBSCRIPTION_TYPE := MobilityProcedureSubscription -// -// -// -// modulepar JSON.String PX_CALLBACK_REFERENCE := "http://127.0.0.1/callback" -// -// -// modulepar JSON.String PX_MEP_ID := ""; + modulepar JSON.String PX_APP_D_ID := "5lkj4782-2c70-4e47-9a4e-0ee3a1a0fd1f"; } // End of module LocationAPI_Pixits diff --git a/ttcn/LibMec/MepmPkgm/ttcn/MepmPkgm_TypesAndValues.ttcn b/ttcn/LibMec/MepmPkgm/ttcn/MepmPkgm_TypesAndValues.ttcn index 4d6c6bbc8b6b70896156324f918033dc0f48523a..72033f8b39d2e0793332bb346c70bf982938cf40 100644 --- a/ttcn/LibMec/MepmPkgm/ttcn/MepmPkgm_TypesAndValues.ttcn +++ b/ttcn/LibMec/MepmPkgm/ttcn/MepmPkgm_TypesAndValues.ttcn @@ -83,7 +83,6 @@ type enumerated NotificationType { OP_CHANGE } - type record AppPkgNotification { NotificationType notificationType, JSON.String subscriptionId, @@ -92,127 +91,6 @@ type record AppPkgNotification { JSON.AnyURI links } - -// -// -//type record of AppMobilityServiceInfo AppMobilityServiceInfos; -//type record AppMobilityServiceInfo { -// RegistrationInfos registeredAppMobilityService , -// String appMobilityServiceId -//} -// -//type record of RegistrationInfo RegistrationInfos; -//type record RegistrationInfo { -// ServiceConsumerId serviceConsumerId, -// DeviceInformations deviceInformation optional, -// UInt32 expiryTime optional -//} -// -// -// -// -// -//type record of ServiceConsumerId ServiceConsumerIds; -//type record ServiceConsumerId { -// String appInstanceId optional, -// String mepId optional -//} -// -//// Erroneous parameter: appInstance should be appInstanceId -//type record of ServiceConsumer ServiceConsumers; -//type record ServiceConsumer { -// String appInstance optional, -// String mepId optional -//} -// -//type record of DeviceInformation DeviceInformations; -//type record DeviceInformation { -// String associateId -//} -// -// -//type JSON.AnyURI links; -// -//type enumerated SubscriptionType { -// MobilityProcedureSubscription, -// AdjacentAppInfoSubscription -//} -// -//type record Subscription { -// JSON.AnyURI href, -// SubscriptionType subscriptionType -//} -// -// -//type record of AmsSubscriptionLinkList AmsSubscriptionLinkLists; -//type record AmsSubscriptionLinkList { -// JSON.AnyURI links, -// Subscription subscription -//} -// -// -//type record MobilityProcedureSubscriptionError { -// SubscriptionType subscriptionType, -// JSON.AnyURI callbackReference, -// JSON.AnyURI links optional, -// FilterCriteria filterCriteria, -// TimeStamp expiryDeadline optional -//} -// -// -// -// -//type record of MobilityProcedureSubscription MobilityProcedureSubscriptions; -//type record MobilityProcedureSubscription { -// SubscriptionType subscriptionType, -// JSON.AnyURI callbackReference, -// JSON.AnyURI links optional, -// FilterCriteria filterCriteria, -// TimeStamp expiryDeadline optional -//} -// -//type enumerated MobilityStatusType { -// INTERHOST_MOVEOUT_TRIGGERED, -// TARGET_APPINST_CONFIRMED, -// TARGET_TRAFFIC_RULE_ACTIVATED, -// INTERHOST_MOVEOUT_COMPLETED, -// INTERHOST_MOVEOUT_FAILED -//} -// -//type record AssociateIdList { -// String associateId -//} -// -//type record of FilterCriteria FilterCriterias; -//type record FilterCriteria { -// String appInstanceId optional, -// AssociateIdList associateId optional, -// MobilityStatusType mobilityStatus -//} -// -// -// -//type record AdjacentFilterCriteria { -// String appInstanceId optional -//} -// -// -//type record of ExpiryNotification ExpiryNotifications; -//type record ExpiryNotification { -// TimeStamp timeStamp, -// JSON.AnyURI links optional, -// TimeStamp expiryDeadline -//} -// -//type record of AdjacentAppInfoSubscription AdjacentAppInfoSubscriptions; -//type record AdjacentAppInfoSubscription { -// SubscriptionType subscriptionType, -// JSON.AnyURI callbackReference, -// JSON.AnyURI links optional, -// AdjacentFilterCriteria filterCriteria, -// TimeStamp expiryDeadline optional -//} - /** * @desc * @member seconds The seconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC diff --git a/ttcn/LibMec/ttcn/JSON.ttcn b/ttcn/LibMec/ttcn/JSON.ttcn index fe3942cfd8b9fea094beb6019c9651c48b3b8db6..5867bd3ced6ddf8f960b6c4835e693de91c51e3e 100644 --- a/ttcn/LibMec/ttcn/JSON.ttcn +++ b/ttcn/LibMec/ttcn/JSON.ttcn @@ -95,13 +95,13 @@ module JSON { variant "JSON:array" }*/ // Subsidiary array types - type record of JSON.String StrArray /*with { + type record of JSON.String StrArray; /*with { variant "JSON:array" }*/ - type record of JSON.Number NumArray /*with { + type record of JSON.Number NumArray; /*with { variant "JSON:array" }*/ - type record of JSON.Integer IntArray /*with { + type record of JSON.Integer IntArray; /*with { variant "JSON:array" } type record of JSON.Bool BoolArray with { @@ -142,7 +142,7 @@ module JSON { //JSON literals //When only the true and false literals are allowed - type boolean Bool /*with { variant "JSON:literal" }*/ + type boolean Bool; /*with { variant "JSON:literal" }*/ //When only the null literal is allowed type enumerated Null { null_ }; /*with { variant "JSON:literal" }*/ diff --git a/ttcn/LibMec/ttcn/LibMec_Pixits.ttcn b/ttcn/LibMec/ttcn/LibMec_Pixits.ttcn index 8e5b5a985e6e127800a97c58c8f3e7e3ea54092d..55f8142e6c3aae3cfb76b355875b3b9ffbd54a57 100644 --- a/ttcn/LibMec/ttcn/LibMec_Pixits.ttcn +++ b/ttcn/LibMec/ttcn/LibMec_Pixits.ttcn @@ -24,25 +24,25 @@ module LibMec_Pixits { modulepar charstring PX_ME_BWM_URI := "/bwm/v1/bw_allocations"; - modulepar charstring PX_ME_APP_AMS_URI := "/amsi/v1/appMobilityServices" + modulepar charstring PX_ME_APP_AMS_URI := "/amsi/v1/appMobilityServices"; - modulepar charstring PX_ME_APP_AMS_SUBS := "/amsi/v1/subscriptions" + modulepar charstring PX_ME_APP_AMS_SUBS := "/amsi/v1/subscriptions"; - modulepar charstring PX_MEO_GRANT_URI := "/granting/v1/grants" + modulepar charstring PX_MEO_GRANT_URI := "/granting/v1/grants"; - modulepar charstring PX_MEO_PKGM_URI := "/apmi/v1/app_packages" + modulepar charstring PX_MEO_PKGM_URI := "/apmi/v1/app_packages"; - modulepar charstring PX_MEO_PKGM_SUBS := "/apmi/v1/subscriptions" + modulepar charstring PX_MEO_PKGM_SUBS := "/apmi/v1/subscriptions"; - modulepar charstring PX_MEPM_PKGM_URI := "/apmi/v1/app_packages" + modulepar charstring PX_MEPM_PKGM_URI := "/apmi/v1/app_packages"; - modulepar charstring PX_MEPM_PKGM_SUBS := "/apmi/v1/subscriptions" + modulepar charstring PX_MEPM_PKGM_SUBS := "/apmi/v1/subscriptions"; - modulepar charstring PX_MEX_LCM_URI := "/alcmi/v1/app_instances" + modulepar charstring PX_MEX_LCM_URI := "/alcmi/v1/app_instances"; - modulepar charstring PX_MEX_LCM_SUBS := "/alcmi/v1/subscriptions" + modulepar charstring PX_MEX_LCM_SUBS := "/alcmi/v1/subscriptions"; - modulepar charstring PX_MEX_LCM_OP_OCC_URI := "/alcmi/v1/app_lcm_op_occs" + modulepar charstring PX_MEX_LCM_OP_OCC_URI := "/alcmi/v1/app_lcm_op_occs"; modulepar charstring PX_UE_APP_CTX_URI := "/mx2/v1/app_contexts"; @@ -58,4 +58,26 @@ module LibMec_Pixits { modulepar charstring PX_ME_APP_SUPPORT_TIMING_CAPS_URI := ""; + modulepar charstring PX_FAI_FA_INFO_URI := "/fai/v1/fa_info"; + + modulepar charstring PX_FAI_DEVICE_INFO_URI:= "/fai/v1/device_info"; + + modulepar charstring PX_FAI_CABLE_LINE_INFO_URI := "/fai/v1/cable_line_info"; + + modulepar charstring PX_FAI_OPTICAL_NW_INFO_URI := "/fai/v1/optical_network_info"; + + modulepar charstring PX_FAI_SUB_URI := "/fai/v1/optical_network_info"; + + modulepar charstring PX_UE_ZONAL_TRAF_SUB_URI := "/fai/v1/optical_network_info"; + + modulepar charstring PX_UE_LOC_QRY_URI := ""; + + modulepar charstring PX_UE_LOC_USERS_URI := ""; + + modulepar charstring PX_UE_DIST_SUB_URI := ""; + + modulepar charstring PX_UE_PERIODIC_SUB_URI := ""; + + modulepar charstring PX_UE_LOC_USERTRACK_SUB_URI := ""; + } // End of module LibMec_Pixits diff --git a/ttcn/patch_lib_http/LibItsHttp_JsonMessageBodyTypes.ttcn b/ttcn/patch_lib_http/LibItsHttp_JsonMessageBodyTypes.ttcn index 77cc899a55c5a28f5d7942cd96613458c6a2abc1..efb7eb5ce6f4db16f9adf34cddb81a244178e598 100644 --- a/ttcn/patch_lib_http/LibItsHttp_JsonMessageBodyTypes.ttcn +++ b/ttcn/patch_lib_http/LibItsHttp_JsonMessageBodyTypes.ttcn @@ -20,11 +20,11 @@ module LibItsHttp_JsonMessageBodyTypes { import from MepmPkgm_TypesAndValues all; // LibMec/AppLCMAPI import from AppLCM_TypesAndValues all; - // LibMec/UEAppInterfaceAPI import from UEAppInterfaceAPI_TypesAndValues all; - - + // LibMec/FixedAccessInformationServiceAPI + import from FixedAccessInformationServiceAPI_TypesAndValues all; + /** * This file volontary contains a trivial declaration of the type JsonBody. * In accordance with your TTCN-3 module LibItsHttp_JSONTypes, you have to change the JsonBody typing. @@ -68,8 +68,8 @@ module LibItsHttp_JsonMessageBodyTypes { AppMobilityServiceInfo appMobilityServiceInfo, Ams_TypesAndValues.ProblemDetails problemDetails_ams, Ams_TypesAndValues.RegistrationRequest registrationRequest_ams, - Ams_TypesAndValues.MobilityProcedureSubscription subscriptionLinkList_ams, - Ams_TypesAndValues.AdjacentAppInfoSubscription adjacentAppInfoSubscription_ams, + Ams_TypesAndValues.MobilityProcedureSubscription_ subscriptionLinkList_ams, + Ams_TypesAndValues.AdjacentAppInfoSubscription_ adjacentAppInfoSubscription_ams, Ams_TypesAndValues.ExpiryNotification expireNotification_ams, Grant_TypesAndValues.GrantRequest grantRequest, Grant_TypesAndValues.Grant grantResponse, @@ -120,10 +120,16 @@ module LibItsHttp_JsonMessageBodyTypes { AppTerminationNotificationSubscription appTerminationNotificationSubscription, DnsRuleList dnsRuleList, DnsRule dnsRule, - SerAvailabilityNotificationSubscription serAvailabilityNotificationSubscription, + SerAvailabilityNotificationSubscription_ serAvailabilityNotificationSubscription, TimingCaps timingCaps, CurrentTime currentTime, AppEnablementAPI_TypesAndValues.ProblemDetails problemDetails_app_enablement, + FaInfo faInfo, + DeviceInfo deviceInfo, + CableLineInfo cableLineInfo, + PonInfo ponInfo, + FixedAccessInformationServiceAPI_TypesAndValues.SubscriptionLinkList subscriptionLinkList_fai, + OnuAlarmSubscription onuAlarmSubscription, universal charstring raw } with { variant "" diff --git a/ttcn/patch_lib_http/LibItsHttp_JsonTemplates.ttcn b/ttcn/patch_lib_http/LibItsHttp_JsonTemplates.ttcn index 7dd0c735cbd992ef811c3d4ca9667745647479cd..3d48df7ea75a2ca680236b767ae16af907172a09 100644 --- a/ttcn/patch_lib_http/LibItsHttp_JsonTemplates.ttcn +++ b/ttcn/patch_lib_http/LibItsHttp_JsonTemplates.ttcn @@ -12,43 +12,31 @@ module LibItsHttp_JsonTemplates { // LibMec/LocationAPI import from LocationAPI_TypesAndValues all; - import from LocationAPI_Templates all; // LibMec/UEidentityAPI import from UEidentityAPI_TypesAndValues all; - import from UEidentityAPI_Templates all; // LibMec/RnisAPI import from RnisAPI_TypesAndValues all; - import from RnisAPI_Templates all; // LibMec/BwManagementAPI import from BwManagementAPI_TypesAndValues all; - import from BwManagementAPI_Templates all; // LibMec/AppEnablementAPI import from AppEnablementAPI_TypesAndValues all; - import from AppEnablementAPI_Templates all; // LibMec/Ams import from Ams_TypesAndValues all; - import from Ams_Templates all; //LibMec/Grant import from Grant_TypesAndValues all; - import from Grant_Templates all; //LibMec/MeoPkg import from MeoPkgm_TypesAndValues all; - import from MeoPkgm_Templates all; //LibMec/MepmPkg import from MepmPkgm_TypesAndValues all; - import from MepmPkgm_Templates all; - + // LibMec/AppLCM import from AppLCM_TypesAndValues all; - import from AppLCM_Templates all; // LibMec/UEAppInterfaceAPI import from UEAppInterfaceAPI_TypesAndValues all; - import from UEAppInterfaceAPI_Templates all; - - // TODO Add here your custom RFCs import + // LibMec/module FixedAccessInformationServiceAPI + import from FixedAccessInformationServiceAPI_TypesAndValues all; // LibItsHttp import from LibItsHttp_JsonMessageBodyTypes all; - import from LibItsHttp_JSONTypes all; template (value) JsonBody m_json_body_raw( in template (value) charstring p_raw @@ -360,26 +348,26 @@ group ams_api { } // End of template m_body_json_ue_identity_problem_details template (present) JsonBody mw_body_json_ams_subscriptions( - template (present) Ams_TypesAndValues.MobilityProcedureSubscription p_amsSubscriptionLinkList := ? + template (present) Ams_TypesAndValues.MobilityProcedureSubscription_ p_amsSubscriptionLinkList := ? ) := { subscriptionLinkList_ams := p_amsSubscriptionLinkList } // End of template mw_body_json_ue_identity_problem_details template (present) JsonBody m_body_json_ams_subscriptions( - template (present) Ams_TypesAndValues.MobilityProcedureSubscription p_amsSubscriptionLinkList := ? + template (present) Ams_TypesAndValues.MobilityProcedureSubscription_ p_amsSubscriptionLinkList := ? ) := { subscriptionLinkList_ams := p_amsSubscriptionLinkList } // End of template mw_body_json_ue_identity_problem_details template (present) JsonBody mw_body_json_mobility_procedure_notification( - template (present) Ams_TypesAndValues.MobilityProcedureSubscription p_amsSubscriptionLinkList := ? + template (present) Ams_TypesAndValues.MobilityProcedureSubscription_ p_amsSubscriptionLinkList := ? ) := { subscriptionLinkList_ams := p_amsSubscriptionLinkList } // End of template mw_body_json_mobility_procedure_notification template (present) JsonBody mw_body_json_adjacent_application_info_notification( - template (present) Ams_TypesAndValues.AdjacentAppInfoSubscription p_adjacentAppInfoSubscription := ? + template (present) Ams_TypesAndValues.AdjacentAppInfoSubscription_ p_adjacentAppInfoSubscription := ? ) := { adjacentAppInfoSubscription_ams := p_adjacentAppInfoSubscription } // End of template mw_body_json_mobility_procedure_notification @@ -824,13 +812,13 @@ group ams_api { } // End of template mw_body_json_dns_rule_list template (value) JsonBody m_body_json_srv_avail_notif_subscription( - in template (value) SerAvailabilityNotificationSubscription p_serAvailabilityNotificationSubscription + in template (value) SerAvailabilityNotificationSubscription_ p_serAvailabilityNotificationSubscription ) := { serAvailabilityNotificationSubscription := p_serAvailabilityNotificationSubscription } // End of template m_body_json_srv_avail_notif_subscription template (present) JsonBody mw_body_json_srv_avail_notif_subscription( - template (present) SerAvailabilityNotificationSubscription p_serAvailabilityNotificationSubscription := ? + template (present) SerAvailabilityNotificationSubscription_ p_serAvailabilityNotificationSubscription := ? ) := { serAvailabilityNotificationSubscription := p_serAvailabilityNotificationSubscription } // End of template mw_body_json_srv_avail_notif_subscription @@ -937,4 +925,80 @@ group ams_api { } // End of group ue_app_ctx + group fai { + + template (value) JsonBody m_body_json_fai_fa_info( + in template (value) FaInfo p_faInfo + ) := { + faInfo := p_faInfo + } // End of template m_body_json_fai_fa_info + + template (present) JsonBody mw_body_json_fai_fa_info( + template (present) FaInfo p_faInfo := ? + ) := { + faInfo := p_faInfo + } // End of template mw_body_json_fai_fa_info + + template (value) JsonBody m_body_json_fai_device_info( + in template (value) DeviceInfo p_deviceInfo + ) := { + deviceInfo := p_deviceInfo + } // End of template m_body_json_fai_device_info + + template (present) JsonBody mw_body_json_fai_device_info( + template (present) DeviceInfo p_deviceInfo := ? + ) := { + deviceInfo := p_deviceInfo + } // End of template mw_body_json_fai_device_info + + template (value) JsonBody m_body_json_fai_cable_line_info( + in template (value) CableLineInfo p_cableLineInfo + ) := { + cableLineInfo := p_cableLineInfo + } // End of template m_body_json_fai_cable_line_info + + template (present) JsonBody mw_body_json_fai_cable_line_info( + template (present) CableLineInfo p_cableLineInfo := ? + ) := { + cableLineInfo := p_cableLineInfo + } // End of template mw_body_json_fai_cable_line_info + + template (value) JsonBody m_body_json_fai_pon_info( + in template (value) PonInfo p_ponInfo + ) := { + ponInfo := p_ponInfo + } // End of template m_body_json_fai_pon_info + + template (present) JsonBody mw_body_json_fai_pon_info( + template (present) PonInfo p_ponInfo := ? + ) := { + ponInfo := p_ponInfo + } // End of template mw_body_json_fai_pon_info + + template (value) JsonBody m_body_json_fai_subscription_link_list( + in template (value) FixedAccessInformationServiceAPI_TypesAndValues.SubscriptionLinkList p_subscriptionLinkList + ) := { + subscriptionLinkList_fai := p_subscriptionLinkList + } // End of template m_body_json_fai_subscription_link_list + + template (present) JsonBody mw_body_json_fai_subscription_link_list( + template (present) FixedAccessInformationServiceAPI_TypesAndValues.SubscriptionLinkList p_subscriptionLinkList := ? + ) := { + subscriptionLinkList_fai := p_subscriptionLinkList + } // End of template mw_body_json_fai_subscription_link_list + + template (value) JsonBody m_body_json_fai_onu_alarm_subscription_link_list( + in template (value) OnuAlarmSubscription p_onuAlarmSubscription + ) := { + onuAlarmSubscription := p_onuAlarmSubscription + } // End of template m_body_json_fai_onu_alarm_subscription_link_list + + template (present) JsonBody mw_body_json_fai_onu_alarm_subscription_link_list( + template (present) OnuAlarmSubscription p_onuAlarmSubscription := ? + ) := { + onuAlarmSubscription := p_onuAlarmSubscription + } // End of template mw_body_json_fai_onu_alarm_subscription_link_list + + } // End of group fai + } // End of module LibItsHttp_JsonTemplates