From 11dee7fb890689dc8c040f97dd64330d0be8bf7b Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Tue, 27 Feb 2024 15:37:40 +0000 Subject: [PATCH] HPCC-31390 Allow soaptext1.ecl to be deployed as a query to aks Signed-off-by: Gavin Halliday --- testing/regress/ecl-test-azure.json | 2 +- testing/regress/ecl/soaptext1.ecl | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/testing/regress/ecl-test-azure.json b/testing/regress/ecl-test-azure.json index c06fdaaf7ab..d57c20465e3 100644 --- a/testing/regress/ecl-test-azure.json +++ b/testing/regress/ecl-test-azure.json @@ -58,7 +58,7 @@ "roxiegzip.ecl:TargetIP=roxie", "roxiewhitespace.ecl:TargetIP=roxie", "roxiepipe.ecl:TargetIP=roxie", - "soaptext1.ecl:TargetIP=roxie" + "soaptext1.ecl:remoteRoxieService=roxie,remoteEspService=eclqueries" ], "engineParams":[ "failOnLeaks", diff --git a/testing/regress/ecl/soaptext1.ecl b/testing/regress/ecl/soaptext1.ecl index 97bfd53c212..2022c95cc23 100644 --- a/testing/regress/ecl/soaptext1.ecl +++ b/testing/regress/ecl/soaptext1.ecl @@ -31,14 +31,18 @@ import ^ as root; //Simplified configuration -roxieIP := '.' : STORED('TargetIP'); -espIP := '.' : STORED('TargetIP'); +string roxieIP := '.' : STORED('remoteRoxieService'); +string espIP := '.' : STORED('remoteEspService'); +boolean defaultEncryptConnection := false : stored('encryptConnection'); +boolean defaultPersistConnection := false : stored('persistConnection'); +boolean defaultCallDirect := false : stored('callDirect'); +boolean defaultCallViaEsp := false : stored('callViaEsp'); //Simplified call options - doesn't provide all combinations that should be tested eventually -boolean encryptConnection := #IFDEFINED(root.encryptConnection, false); -boolean persistConnection := #IFDEFINED(root.persistConnection, false); -boolean callDirect := #IFDEFINED(root.callDirect, false); -boolean callViaEsp := #IFDEFINED(root.callViaEsp, false); +boolean encryptConnection := #IFDEFINED(root.encryptConnection, defaultEncryptConnection); +boolean persistConnection := #IFDEFINED(root.persistConnection, defaultPersistConnection); +boolean callDirect := #IFDEFINED(root.callDirect, defaultCallDirect); +boolean callViaEsp := #IFDEFINED(root.callViaEsp, defaultCallViaEsp); //--- end of version configuration ---