pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39078?usp=email )
Change subject: remsim: Add initial testenv ......................................................................
remsim: Add initial testenv
"server" testsuite is working as goos as in docker-playground.git "bankd" testsuite is currently failing due to bankd exiting early after starting. "client" is not currently working/running in docker-playground, initial config copied here for completeness.
This commit hence allows already quickly running "server" testsuite.
Change-Id: Ic69a04342a4cdfced90cf8ffbe7e5cdede8d4b8e --- A remsim/bankd/REMSIM_Tests.cfg A remsim/bankd/bankd_pcsc_slots.csv A remsim/client/REMSIM_Tests.cfg R remsim/server/REMSIM_Tests.cfg A remsim/testenv_bankd.cfg A remsim/testenv_client.cfg A remsim/testenv_server.cfg 7 files changed, 73 insertions(+), 2 deletions(-)
Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve
diff --git a/remsim/bankd/REMSIM_Tests.cfg b/remsim/bankd/REMSIM_Tests.cfg new file mode 100644 index 0000000..357e6a6 --- /dev/null +++ b/remsim/bankd/REMSIM_Tests.cfg @@ -0,0 +1,20 @@ +[ORDERED_INCLUDE] +"../../Common.cfg" +"../REMSIM_Tests.default" + +[LOGGING] +*.JUnitLogger.filename_stem := "junit-xml-bankd" + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +# IP address on which the simulated server binds +REMSIM_Tests.mp_server_ip := "127.0.0.10" +# IP address of the IUT (bankd) to which simulated client connects +REMSIM_Tests.mp_bankd_ip := "127.0.0.30" +VPCD_Adapter.mp_vpcd_host := "127.0.0.30" + +[MAIN_CONTROLLER] + +[EXECUTE] +RemsimBankd_Tests.control diff --git a/remsim/bankd/bankd_pcsc_slots.csv b/remsim/bankd/bankd_pcsc_slots.csv new file mode 100644 index 0000000..0e8d529 --- /dev/null +++ b/remsim/bankd/bankd_pcsc_slots.csv @@ -0,0 +1,2 @@ +"1","0","Virtual PCD 00 00" +"1","1","Virtual PCD 00 01" diff --git a/remsim/client/REMSIM_Tests.cfg b/remsim/client/REMSIM_Tests.cfg new file mode 100644 index 0000000..b249087 --- /dev/null +++ b/remsim/client/REMSIM_Tests.cfg @@ -0,0 +1,19 @@ +[ORDERED_INCLUDE] +"../../Common.cfg" +"../REMSIM_Tests.default" + +[LOGGING] +*.JUnitLogger.filename_stem := "junit-xml-client" + +[TESTPORT_PARAMETERS] +# IP address to which ATS binds emulated remsim-server +REMSIM_Tests.mp_server_ip := "127.0.0.10" +# IP address to which ATS binds emulated remsim-bankd +REMSIM_Tests.mp_bankd_ip := "127.0.0.10" + +[MODULE_PARAMETERS] + +[MAIN_CONTROLLER] + +[EXECUTE] +RemsimClient_Tests.control diff --git a/remsim/REMSIM_Tests.cfg b/remsim/server/REMSIM_Tests.cfg similarity index 86% rename from remsim/REMSIM_Tests.cfg rename to remsim/server/REMSIM_Tests.cfg index e3bb900..8a2b3fc 100644 --- a/remsim/REMSIM_Tests.cfg +++ b/remsim/server/REMSIM_Tests.cfg @@ -1,8 +1,8 @@ [ORDERED_INCLUDE] # Common configuration, shared between test suites -"../Common.cfg" +"../../Common.cfg" # testsuite specific configuration, not expected to change -"./REMSIM_Tests.default" +"../REMSIM_Tests.default"
[MODULE_PARAMETERS] RemsimClient_Tests.mp_have_local_client := true diff --git a/remsim/testenv_bankd.cfg b/remsim/testenv_bankd.cfg new file mode 100644 index 0000000..04baeaf --- /dev/null +++ b/remsim/testenv_bankd.cfg @@ -0,0 +1,14 @@ +[testsuite] +program=REMSIM_Tests +config=bankd/REMSIM_Tests.cfg + +[pcscd] +program=pcscd -f -d +make=no +package=pcscd + +[bankd] +program=osmo-remsim-bankd -d DMAIN:1 -i 127.0.0.10 -I 127.0.0.30 +make=osmo-remsim +package=osmo-remsim-bankd +copy=bankd/bankd_pcsc_slots.csv diff --git a/remsim/testenv_client.cfg b/remsim/testenv_client.cfg new file mode 100644 index 0000000..c7d525b --- /dev/null +++ b/remsim/testenv_client.cfg @@ -0,0 +1,8 @@ +[testsuite] +program=REMSIM_Tests +config=client/REMSIM_Tests.cfg + +[client] +program=osmo-remsim-client-shell +make=osmo-remsim +package=osmo-remsim-client-shell diff --git a/remsim/testenv_server.cfg b/remsim/testenv_server.cfg new file mode 100644 index 0000000..f28296a --- /dev/null +++ b/remsim/testenv_server.cfg @@ -0,0 +1,8 @@ +[testsuite] +program=REMSIM_Tests +config=server/REMSIM_Tests.cfg + +[server] +program=osmo-remsim-server +make=osmo-remsim +package=osmo-remsim-server
-
pespin