From 2c4878232a576abde82ee9a9f76ddab2d0f518bc Mon Sep 17 00:00:00 2001 From: Dmitriy Boltovskiy Date: Tue, 23 Jul 2019 08:38:05 -0400 Subject: [PATCH 1/2] Update common modules to support HTTP and EXT PTU flows --- .../commonDataExchange.lua | 4 + .../API/ServiceStatusUpdateToHMI/common.lua | 4 +- test_scripts/API/VehicleData/DOP/common.lua | 4 + .../GpsShiftSupport/commonGpsShift.lua | 1 + .../AppServices/commonAppServices.lua | 11 +- .../CloudAppRPCs/commonCloudAppRPCs.lua | 11 +- test_scripts/SDL5_0/FullAppID/common.lua | 3 + .../Security/SSLHandshakeFlow/common.lua | 11 +- test_scripts/TheSameApp/commonTheSameApp.lua | 5 +- user_modules/sequences/actions.lua | 150 ++++++++++++++---- 10 files changed, 146 insertions(+), 58 deletions(-) diff --git a/test_scripts/API/Expanded_proprietary_data_exchange/commonDataExchange.lua b/test_scripts/API/Expanded_proprietary_data_exchange/commonDataExchange.lua index 98b53955cc..50de3dcf8a 100644 --- a/test_scripts/API/Expanded_proprietary_data_exchange/commonDataExchange.lua +++ b/test_scripts/API/Expanded_proprietary_data_exchange/commonDataExchange.lua @@ -7,6 +7,10 @@ local commonFunctions = require("user_modules/shared_testcases/commonFunctions") local utils = require("user_modules/utils") local events = require("events") local json = require("modules/json") +local runner = require('user_modules/script_runner') + +-- Set applicalbe SDL policy mode +runner.testSettings.restrictions.sdlBuildOptions = { { extendedPolicy = { "PROPRIETARY", "EXTERNAL_PROPRIETARY" } } } --[[ General configuration parameters ]] config.defaultProtocolVersion = 2 diff --git a/test_scripts/API/ServiceStatusUpdateToHMI/common.lua b/test_scripts/API/ServiceStatusUpdateToHMI/common.lua index 69664304ba..460149c72b 100644 --- a/test_scripts/API/ServiceStatusUpdateToHMI/common.lua +++ b/test_scripts/API/ServiceStatusUpdateToHMI/common.lua @@ -104,7 +104,7 @@ function m.policyTableUpdateSuccess(pPTUpdateFunc) :Times(AtMost(1)) m.getHMIConnection():ExpectRequest("VehicleInfo.GetVehicleData", { odometer = true }) end - m.getHMIConnection():ExpectRequest("BasicCommunication.PolicyUpdate") + m.isPTUStarted() :Do(function(e, data) if e.occurences == 1 then m.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", { }) @@ -123,7 +123,7 @@ function m.policyTableUpdateUnsuccess() common.getHMIConnection():ExpectRequest("BasicCommunication.DecryptCertificate") :Times(0) end - common.getHMIConnection():ExpectRequest("BasicCommunication.PolicyUpdate") + m.isPTUStarted() :Do(function(e, data) if e.occurences == 1 then common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", { }) diff --git a/test_scripts/API/VehicleData/DOP/common.lua b/test_scripts/API/VehicleData/DOP/common.lua index 6eacf07cec..caa619ed99 100644 --- a/test_scripts/API/VehicleData/DOP/common.lua +++ b/test_scripts/API/VehicleData/DOP/common.lua @@ -59,4 +59,8 @@ function m.checkAbsenceOfParam(pParam, pData) return true end +function m.ptUpdate(pTbl) + pTbl.policy_table.functional_groupings["Location-1"].user_consent_prompt = nil +end + return m diff --git a/test_scripts/API/VehicleData/GpsShiftSupport/commonGpsShift.lua b/test_scripts/API/VehicleData/GpsShiftSupport/commonGpsShift.lua index 477b60d507..58f27ed00f 100644 --- a/test_scripts/API/VehicleData/GpsShiftSupport/commonGpsShift.lua +++ b/test_scripts/API/VehicleData/GpsShiftSupport/commonGpsShift.lua @@ -42,6 +42,7 @@ m.gpsParams = { --[[ Functions ]] function m.pTUpdateFunc(tbl) tbl.policy_table.app_policies[config.application1.registerAppInterfaceParams.fullAppID].groups = {"Base-4", "Location-1"} + tbl.policy_table.functional_groupings["Location-1"].user_consent_prompt = nil end function m.checkShifted(data, pShiftValue) diff --git a/test_scripts/AppServices/commonAppServices.lua b/test_scripts/AppServices/commonAppServices.lua index c1a60b4f0f..0cc6f59b3a 100644 --- a/test_scripts/AppServices/commonAppServices.lua +++ b/test_scripts/AppServices/commonAppServices.lua @@ -459,16 +459,9 @@ function commonAppServices.getRpcPassThroughTimeoutFromINI() return tonumber(RpcPassThroughTimeout) end -function commonAppServices:Request_PTU() - local is_test_fail = false - local hmi_app1_id = config.application1.registerAppInterfaceParams.appName +function commonAppServices:Request_PTU() commonAppServices.getHMIConnection():SendNotification("SDL.OnPolicyUpdate", {} ) - EXPECT_HMINOTIFICATION("SDL.OnStatusUpdate", {status = "UPDATE_NEEDED"}) - - EXPECT_HMICALL("BasicCommunication.PolicyUpdate",{ file = "/tmp/fs/mp/images/ivsu_cache/sdl_snapshot.json" }) - :Do(function(_,data) - commonAppServices.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) + commonAppServices.isPTUStarted() end function commonAppServices.GetPolicySnapshot() diff --git a/test_scripts/CloudAppRPCs/commonCloudAppRPCs.lua b/test_scripts/CloudAppRPCs/commonCloudAppRPCs.lua index 7ce47a9a19..6803a8f2bb 100644 --- a/test_scripts/CloudAppRPCs/commonCloudAppRPCs.lua +++ b/test_scripts/CloudAppRPCs/commonCloudAppRPCs.lua @@ -39,16 +39,9 @@ function commonCloudAppRPCs.getCloudAppStoreConfig() } end -function commonCloudAppRPCs:Request_PTU() - local is_test_fail = false - local hmi_app1_id = config.application1.registerAppInterfaceParams.appName +function commonCloudAppRPCs:Request_PTU() commonCloudAppRPCs.getHMIConnection():SendNotification("SDL.OnPolicyUpdate", {} ) - EXPECT_HMINOTIFICATION("SDL.OnStatusUpdate", {status = "UPDATE_NEEDED"}) - - EXPECT_HMICALL("BasicCommunication.PolicyUpdate",{ file = "/tmp/fs/mp/images/ivsu_cache/sdl_snapshot.json" }) - :Do(function(_,data) - commonCloudAppRPCs.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) + commonCloudAppRPCs.isPTUStarted() end function commonCloudAppRPCs.test_assert(condition, msg) diff --git a/test_scripts/SDL5_0/FullAppID/common.lua b/test_scripts/SDL5_0/FullAppID/common.lua index a34368f0fc..90ecce3dd2 100644 --- a/test_scripts/SDL5_0/FullAppID/common.lua +++ b/test_scripts/SDL5_0/FullAppID/common.lua @@ -14,6 +14,9 @@ local sdl = require("SDL") local commonSteps = require("user_modules/shared_testcases/commonSteps") local commonSmoke = require('test_scripts/Smoke/commonSmoke') +-- Set applicalbe SDL policy mode +runner.testSettings.restrictions.sdlBuildOptions = { { extendedPolicy = { "PROPRIETARY" } } } + --[[ Local Variables ]] local m = commonSteps diff --git a/test_scripts/Security/SSLHandshakeFlow/common.lua b/test_scripts/Security/SSLHandshakeFlow/common.lua index 23dfb267a0..7977470263 100644 --- a/test_scripts/Security/SSLHandshakeFlow/common.lua +++ b/test_scripts/Security/SSLHandshakeFlow/common.lua @@ -203,7 +203,7 @@ function m.defaultExpNotificationFunc() m.getHMIConnection():ExpectRequest("BasicCommunication.DecryptCertificate") :Do(function(_, d) m.getHMIConnection():SendResponse(d.id, d.method, "SUCCESS", { }) - utils.wait(1000) -- time for SDL to save certificates + utils.wait(1000) -- time for SDL to save certificates end) :Times(AnyNumber()) m.getHMIConnection():ExpectRequest("VehicleInfo.GetVehicleData", { odometer = true }) @@ -217,12 +217,9 @@ function m.policyTableUpdate(pPTUpdateFunc, pExpNotificationFunc) end function m.policyTableUpdateSuccess(pPTUpdateFunc) - m.getHMIConnection():ExpectRequest("BasicCommunication.PolicyUpdate") - :Do(function(e, d) - if e.occurences == 1 then - m.getHMIConnection():SendResponse(d.id, d.method, "SUCCESS", { }) - m.policyTableUpdate(pPTUpdateFunc) - end + m.isPTUStarted() + :Do(function() + m.policyTableUpdate(pPTUpdateFunc) end) end diff --git a/test_scripts/TheSameApp/commonTheSameApp.lua b/test_scripts/TheSameApp/commonTheSameApp.lua index ced2573116..66aed7ca4f 100644 --- a/test_scripts/TheSameApp/commonTheSameApp.lua +++ b/test_scripts/TheSameApp/commonTheSameApp.lua @@ -104,10 +104,7 @@ function common.registerAppEx(pAppId, pAppParams, pMobConnId, pHasPTU) :Do(function(_, d1) common.app.setHMIId(d1.params.application.appID, pAppId) if pHasPTU then - common.hmi.getConnection():ExpectRequest("BasicCommunication.PolicyUpdate") - :Do(function(_, d2) - common.hmi.getConnection():SendResponse(d2.id, d2.method, "SUCCESS", { }) - end) + common.isPTUStarted() end end) session:ExpectResponse(corId, { success = true, resultCode = "SUCCESS" }) diff --git a/user_modules/sequences/actions.lua b/user_modules/sequences/actions.lua index 032dd68119..0f96373e34 100644 --- a/user_modules/sequences/actions.lua +++ b/user_modules/sequences/actions.lua @@ -35,6 +35,13 @@ m.timeout = 2000 --[[ Variables ]] local hmiAppIds = {} +local policyModes = { + P = "PROPRIETARY", + EP = "EXTERNAL_PROPRIETARY", + H = "HTTP" +} +local ptuAppNum + test.mobileConnections = {} test.mobileSession = {} @@ -115,18 +122,14 @@ end --! @return: PTU table --]] local function getPTUFromPTS() - local pTbl = {} - local ptsFileName = commonFunctions:read_parameter_from_smart_device_link_ini("SystemFilesPath") .. "/" - .. commonFunctions:read_parameter_from_smart_device_link_ini("PathToSnapshot") - if utils.isFileExist(ptsFileName) then - pTbl = utils.jsonFileToTable(ptsFileName) - else + local pTbl = m.sdl.getPTS() + if pTbl == nil then utils.cprint(35, "PTS file was not found, PreloadedPT is used instead") - local appConfigFolder = commonFunctions:read_parameter_from_smart_device_link_ini("AppConfigFolder") + local appConfigFolder = m.sdl.getSDLIniParameter("AppConfigFolder") if appConfigFolder == nil or appConfigFolder == "" then appConfigFolder = commonPreconditions:GetPathToSDL() end - local preloadedPT = commonFunctions:read_parameter_from_smart_device_link_ini("PreloadedPT") + local preloadedPT = m.sdl.getSDLIniParameter("PreloadedPT") local ptsFile = appConfigFolder .. preloadedPT if utils.isFileExist(ptsFile) then pTbl = utils.jsonFileToTable(ptsFile) @@ -460,25 +463,14 @@ function m.ptu.getAppData(pAppId) } end ---[[ @ptu.getAppData: perform policy table update sequence ---! @parameters: ---! pPTUpdateFunc - function which contains updates for policy table ---! pExpNotificationFunc - specific notification function ---! @return: none ---]] -function m.ptu.policyTableUpdate(pPTUpdateFunc, pExpNotificationFunc) - if pExpNotificationFunc then - pExpNotificationFunc() - end - local ptsFileName = commonFunctions:read_parameter_from_smart_device_link_ini("SystemFilesPath") .. "/" - .. commonFunctions:read_parameter_from_smart_device_link_ini("PathToSnapshot") +local function policyTableUpdateProprietary(pPTUpdateFunc, pExpNotificationFunc) local ptuFileName = os.tmpname() local requestId = m.hmi.getConnection():SendRequest("SDL.GetPolicyConfigurationData", { policyType = "module_config", property = "endpoints" }) m.hmi.getConnection():ExpectResponse(requestId) :Do(function() m.hmi.getConnection():SendNotification("BasicCommunication.OnSystemRequest", - { requestType = "PROPRIETARY", fileName = ptsFileName }) + { requestType = "PROPRIETARY", fileName = m.sdl.getPTSFilePath() }) local ptuTable = getPTUFromPTS() for i, _ in pairs(m.mobile.getApps()) do ptuTable.policy_table.app_policies[m.app.getParams(i).fullAppID] = m.ptu.getAppData(i) @@ -495,8 +487,8 @@ function m.ptu.policyTableUpdate(pPTUpdateFunc, pExpNotificationFunc) m.hmi.getConnection():ExpectRequest("BasicCommunication.SystemRequest") :Do(function(_, d3) if not pExpNotificationFunc then - m.hmi.getConnection():ExpectRequest("VehicleInfo.GetVehicleData", { odometer = true }) - m.hmi.getConnection():ExpectNotification("SDL.OnStatusUpdate", { status = "UP_TO_DATE" }) + m.hmi.getConnection():ExpectRequest("VehicleInfo.GetVehicleData", { odometer = true }) + m.hmi.getConnection():ExpectNotification("SDL.OnStatusUpdate", { status = "UP_TO_DATE" }) end m.hmi.getConnection():SendResponse(d3.id, "BasicCommunication.SystemRequest", "SUCCESS", { }) m.hmi.getConnection():SendNotification("SDL.OnReceivedPolicyUpdate", { policyfile = d3.params.fileName }) @@ -513,6 +505,44 @@ function m.ptu.policyTableUpdate(pPTUpdateFunc, pExpNotificationFunc) end) end +local function policyTableUpdateHttp(pPTUpdateFunc, pExpNotificationFunc) + local ptuFileName = os.tmpname() + local ptuTable = getPTUFromPTS() + for i = 1, m.getAppsCount() do + ptuTable.policy_table.app_policies[m.getConfigAppParams(i).fullAppID] = m.ptu.getAppData(i) + end + if pPTUpdateFunc then + pPTUpdateFunc(ptuTable) + end + utils.tableToJsonFile(ptuTable, ptuFileName) + local cid = m.mobile.getSession(ptuAppNum):SendRPC("SystemRequest", + { requestType = "HTTP", fileName = "PolicyTableUpdate" }, ptuFileName) + if not pExpNotificationFunc then + m.hmi.getConnection():ExpectRequest("VehicleInfo.GetVehicleData", { odometer = true }) + m.hmi.getConnection():ExpectNotification("SDL.OnStatusUpdate", { status = "UP_TO_DATE" }) + end + m.mobile.getSession(ptuAppNum):ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) + :Do(function() os.remove(ptuFileName) end) +end + +--[[ @policyTableUpdate: perform PTU +--! @parameters: +--! pPTUpdateFunc - function with additional updates (optional) +--! pExpNotificationFunc - function with specific expectations (optional) +--! @return: none +--]] +function m.ptu.policyTableUpdate(pPTUpdateFunc, pExpNotificationFunc) + if pExpNotificationFunc then + pExpNotificationFunc() + end + local policyMode = SDL.buildOptions.extendedPolicy + if policyMode == policyModes.P or policyMode == policyModes.EP then + policyTableUpdateProprietary(pPTUpdateFunc, pExpNotificationFunc) + elseif policyMode == policyModes.H then + policyTableUpdateHttp(pPTUpdateFunc, pExpNotificationFunc) + end +end + --[[ Functions of app submodule ]] --- Registration of application sequence @@ -528,10 +558,7 @@ local function registerApp(pAppId, pMobConnId, hasPTU) :Do(function(_, d1) m.app.setHMIId(d1.params.application.appID, pAppId) if hasPTU then - m.hmi.getConnection():ExpectRequest("BasicCommunication.PolicyUpdate") - :Do(function(_, d2) - m.hmi.getConnection():SendResponse(d2.id, d2.method, "SUCCESS", { }) - end) + m.isPTUStarted() end end) session:ExpectResponse(corId, { success = true, resultCode = "SUCCESS" }) @@ -631,6 +658,42 @@ function m.app.getHMIId(pAppId) return nil end +function m.isPTUStarted() + local event = events.Event() + event.matches = function(e1, e2) return e1 == e2 end + local function raisePtuEvent() + RUN_AFTER(function() m.hmi.getConnection():RaiseEvent(event, "PTU start event") end, m.minTimeout) + end + local policyMode = SDL.buildOptions.extendedPolicy + if policyMode == policyModes.P or policyMode == policyModes.EP then + m.hmi.getConnection():ExpectRequest("BasicCommunication.PolicyUpdate") + :Do(function(_, d2) + m.hmi.getConnection():SendResponse(d2.id, d2.method, "SUCCESS", { }) + raisePtuEvent() + end) + elseif policyMode == policyModes.H then + local function getAppNums() + local out = {} + for k in pairs(test.mobileSession) do + table.insert(out, k) + end + return out + end + for _, appNum in pairs(getAppNums()) do + m.mobile.getSession(appNum):ExpectNotification("OnSystemRequest") + :Do(function(_, d3) + if d3.payload.requestType == "HTTP" then + utils.cprint(35, "App ".. appNum .. " will be used for PTU") + ptuAppNum = appNum + raisePtuEvent() + end + end) + :Times(AtMost(2)) + end + end + return m.hmi.getConnection():ExpectEvent(event, "PTU start event") +end + --[[ @app.setHMIId: set HMI application Id by script's mobile application id --! @parameters: --! pHMIAppId - HMI application Id @@ -874,6 +937,38 @@ function m.sdl.stop() return SDL:StopSDL() end +--[[ @sdl.getPTSFilePath: get path to Policy Table Snapshot file +--! @parameters: none +--! @return: path to file +--]] +function m.sdl.getPTSFilePath() + return m.sdl.getSDLIniParameter("SystemFilesPath") .. "/" .. m.sdl.getSDLIniParameter("PathToSnapshot") +end + +--[[ @sdl.getPTS: get Policy Table Snapshot (PTS) +--! @parameters: none +--! @return: table with PTS +--]] +function m.sdl.getPTS() + local ptsFileName = m.sdl.getPTSFilePath() + local pts = nil + if utils.isFileExist(ptsFileName) then + pts = utils.jsonFileToTable(ptsFileName) + end + return pts +end + +--[[ @sdl.deletePTS: delete Policy Table Snapshot file +--! @parameters: none +--! @return: none +--]] +function m.sdl.deletePTS() + local ptsFileName = m.sdl.getPTSFilePath() + if utils.isFileExist(ptsFileName) then + os.remove(ptsFileName) + end +end + --[[ Functions of ATF extension ]] --[[ @DeleteConnection: Remove connection from event dispatcher @@ -1087,6 +1182,7 @@ function m.preconditions() commonFunctions:SDLForceStop() commonSteps:DeletePolicyTable() commonSteps:DeleteLogsFiles() + m.sdl.deletePTS() end --[[ @postconditions: postcondition steps From 581c9206c5bc5d86056a416a3e880f81ae7c5b2b Mon Sep 17 00:00:00 2001 From: Dmitriy Boltovskiy Date: Tue, 23 Jul 2019 10:50:36 -0400 Subject: [PATCH 2/2] Update test scripts to support HTTP and EXT PTU flows --- .../RPCPassThrough/008_PTU_allow_unknown_rpc_passthrough.lua | 1 + test_scripts/CloudAppRPCs/005_SetCloudAppProperties_Success.lua | 1 + .../CloudAppRPCs/007_SetCloudAppProperties_InitNewCloudApp.lua | 1 + test_scripts/CloudAppRPCs/010_get_icon_url.lua | 1 + ...otected_mode_apps_with_same_appName_appID_from_2_devices.lua | 2 +- ...ed_mode_apps_with_same_appName_diff_appID_from_2_devices.lua | 2 +- ...ed_mode_apps_with_diff_appName_same_appID_from_2_devices.lua | 2 +- 7 files changed, 7 insertions(+), 3 deletions(-) diff --git a/test_scripts/AppServices/RPCPassThrough/008_PTU_allow_unknown_rpc_passthrough.lua b/test_scripts/AppServices/RPCPassThrough/008_PTU_allow_unknown_rpc_passthrough.lua index a694481c83..20c87b5d60 100644 --- a/test_scripts/AppServices/RPCPassThrough/008_PTU_allow_unknown_rpc_passthrough.lua +++ b/test_scripts/AppServices/RPCPassThrough/008_PTU_allow_unknown_rpc_passthrough.lua @@ -16,6 +16,7 @@ local common = require('test_scripts/AppServices/commonAppServices') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false +runner.testSettings.restrictions.sdlBuildOptions = { { extendedPolicy = { "PROPRIETARY", "EXTERNAL_PROPRIETARY" } } } --[[ Local Functions ]] local function PTUfunc(tbl) diff --git a/test_scripts/CloudAppRPCs/005_SetCloudAppProperties_Success.lua b/test_scripts/CloudAppRPCs/005_SetCloudAppProperties_Success.lua index ca1e983eb9..d80cf0bd18 100644 --- a/test_scripts/CloudAppRPCs/005_SetCloudAppProperties_Success.lua +++ b/test_scripts/CloudAppRPCs/005_SetCloudAppProperties_Success.lua @@ -21,6 +21,7 @@ local commonFunctions = require ('user_modules/shared_testcases/commonFunctions' --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false +runner.testSettings.restrictions.sdlBuildOptions = { { extendedPolicy = { "PROPRIETARY", "EXTERNAL_PROPRIETARY" } } } --[[ Local Variables ]] local rpc = { diff --git a/test_scripts/CloudAppRPCs/007_SetCloudAppProperties_InitNewCloudApp.lua b/test_scripts/CloudAppRPCs/007_SetCloudAppProperties_InitNewCloudApp.lua index 6eaa78d74e..4dc5b1ce90 100644 --- a/test_scripts/CloudAppRPCs/007_SetCloudAppProperties_InitNewCloudApp.lua +++ b/test_scripts/CloudAppRPCs/007_SetCloudAppProperties_InitNewCloudApp.lua @@ -21,6 +21,7 @@ local commonFunctions = require ('user_modules/shared_testcases/commonFunctions' --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false +runner.testSettings.restrictions.sdlBuildOptions = { { extendedPolicy = { "PROPRIETARY", "EXTERNAL_PROPRIETARY" } } } --[[ Local Variables ]] local rpc = { diff --git a/test_scripts/CloudAppRPCs/010_get_icon_url.lua b/test_scripts/CloudAppRPCs/010_get_icon_url.lua index 1d7fcedbee..cfe4e8055b 100644 --- a/test_scripts/CloudAppRPCs/010_get_icon_url.lua +++ b/test_scripts/CloudAppRPCs/010_get_icon_url.lua @@ -18,6 +18,7 @@ local common = require('test_scripts/CloudAppRPCs/commonCloudAppRPCs') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false + runner.testSettings.restrictions.sdlBuildOptions = { { extendedPolicy = { "PROPRIETARY", "EXTERNAL_PROPRIETARY" } } } --[[ Local Variables ]] local cloud_app_id = "cloudAppID123" diff --git a/test_scripts/TheSameApp/Security/001_Send_RPC_or_encrypted_RPC_in_protected_unprotected_mode_apps_with_same_appName_appID_from_2_devices.lua b/test_scripts/TheSameApp/Security/001_Send_RPC_or_encrypted_RPC_in_protected_unprotected_mode_apps_with_same_appName_appID_from_2_devices.lua index c65df70c97..2a46178ea0 100644 --- a/test_scripts/TheSameApp/Security/001_Send_RPC_or_encrypted_RPC_in_protected_unprotected_mode_apps_with_same_appName_appID_from_2_devices.lua +++ b/test_scripts/TheSameApp/Security/001_Send_RPC_or_encrypted_RPC_in_protected_unprotected_mode_apps_with_same_appName_appID_from_2_devices.lua @@ -68,7 +68,7 @@ runner.Step("Set DTLS protocol in SDL", common.setSDLIniParameter, { "Protocol", runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start) runner.Step("Connect two mobile devices to SDL", common.connectMobDevices, {devices}) runner.Step("Register App1 from device 1", common.registerAppEx, {1, appParams[1], 1}) -runner.Step("Register App2 from device 2", common.registerAppEx, {2, appParams[2], 2}, true) +runner.Step("Register App2 from device 2", common.registerAppEx, {2, appParams[2], 2, true}) runner.Step("Policy Table Update Certificate", common.policyTableUpdate, { common.ptUpdate }) runner.Step("Activate App 1", common.activateApp, { 1 }) diff --git a/test_scripts/TheSameApp/Security/002_Send_RPC_or_encrypted_RPC_in_protected_unprotected_mode_apps_with_same_appName_diff_appID_from_2_devices.lua b/test_scripts/TheSameApp/Security/002_Send_RPC_or_encrypted_RPC_in_protected_unprotected_mode_apps_with_same_appName_diff_appID_from_2_devices.lua index f78bea444a..fb523b3a0d 100644 --- a/test_scripts/TheSameApp/Security/002_Send_RPC_or_encrypted_RPC_in_protected_unprotected_mode_apps_with_same_appName_diff_appID_from_2_devices.lua +++ b/test_scripts/TheSameApp/Security/002_Send_RPC_or_encrypted_RPC_in_protected_unprotected_mode_apps_with_same_appName_diff_appID_from_2_devices.lua @@ -68,7 +68,7 @@ runner.Step("Set DTLS protocol in SDL", common.setSDLIniParameter, { "Protocol", runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start) runner.Step("Connect two mobile devices to SDL", common.connectMobDevices, {devices}) runner.Step("Register App1 from device 1", common.registerAppEx, {1, appParams[1], 1}) -runner.Step("Register App2 from device 2", common.registerAppEx, {2, appParams[2], 2}, true) +runner.Step("Register App2 from device 2", common.registerAppEx, {2, appParams[2], 2, true}) runner.Step("Policy Table Update Certificate", common.policyTableUpdate, { common.ptUpdate }) runner.Step("Activate App 1", common.activateApp, { 1 }) diff --git a/test_scripts/TheSameApp/Security/003_Send_RPC_or_encrypted_RPC_in_protected_unprotected_mode_apps_with_diff_appName_same_appID_from_2_devices.lua b/test_scripts/TheSameApp/Security/003_Send_RPC_or_encrypted_RPC_in_protected_unprotected_mode_apps_with_diff_appName_same_appID_from_2_devices.lua index 45961390d1..c89fe2757c 100644 --- a/test_scripts/TheSameApp/Security/003_Send_RPC_or_encrypted_RPC_in_protected_unprotected_mode_apps_with_diff_appName_same_appID_from_2_devices.lua +++ b/test_scripts/TheSameApp/Security/003_Send_RPC_or_encrypted_RPC_in_protected_unprotected_mode_apps_with_diff_appName_same_appID_from_2_devices.lua @@ -68,7 +68,7 @@ runner.Step("Set DTLS protocol in SDL", common.setSDLIniParameter, { "Protocol", runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start) runner.Step("Connect two mobile devices to SDL", common.connectMobDevices, {devices}) runner.Step("Register App1 from device 1", common.registerAppEx, {1, appParams[1], 1}) -runner.Step("Register App2 from device 2", common.registerAppEx, {2, appParams[2], 2}, true) +runner.Step("Register App2 from device 2", common.registerAppEx, {2, appParams[2], 2, true}) runner.Step("Policy Table Update Certificate", common.policyTableUpdate, { common.ptUpdate }) runner.Step("Activate App 1", common.activateApp, { 1 })