From e524f2ca594a31c0cacabb4dde78dd5d9145ed0a Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Sat, 27 Apr 2019 15:44:44 +0100
Subject: virtual: Unify the lua script into a single one

In the quest to support multiple testcases we will use a single
script. Parts can be enabled/disabled depending on which tests
we want/need to run.

Change-Id: I8a093671173976eba9215c00a7aea0f6cab467c6
---
 .../templates/osmo-mobile-lu.lua.tmpl              | 18 ----------------
 src/osmo_gsm_tester/templates/osmo-mobile.lua.tmpl | 25 ++++++++++++++++++++++
 src/osmo_ms_driver/location_update_test.py         |  2 +-
 src/osmo_ms_driver/starter.py                      |  1 +
 4 files changed, 27 insertions(+), 19 deletions(-)
 delete mode 100644 src/osmo_gsm_tester/templates/osmo-mobile-lu.lua.tmpl
 create mode 100644 src/osmo_gsm_tester/templates/osmo-mobile.lua.tmpl

diff --git a/src/osmo_gsm_tester/templates/osmo-mobile-lu.lua.tmpl b/src/osmo_gsm_tester/templates/osmo-mobile-lu.lua.tmpl
deleted file mode 100644
index c25d799..0000000
--- a/src/osmo_gsm_tester/templates/osmo-mobile-lu.lua.tmpl
+++ /dev/null
@@ -1,18 +0,0 @@
-package.path = '${test.lua_support}/?.lua;' .. package.path
-event = require('ms_support')
-send = 1
-
-function mm_cb(new_state, new_substate, old_substate)
-        if new_state == 19 and new_substate == 1 and send == 1 then
-            send = 0
-            event.send({lu_done=1})
-        end
-end
-
-local cbs = {
-        Mm=mm_cb
-}
-osmo.ms():register(cbs)
-osmo.ms().start()
-
-event.register(osmo.ms():number(), "${test.event_path}")
diff --git a/src/osmo_gsm_tester/templates/osmo-mobile.lua.tmpl b/src/osmo_gsm_tester/templates/osmo-mobile.lua.tmpl
new file mode 100644
index 0000000..0adb895
--- /dev/null
+++ b/src/osmo_gsm_tester/templates/osmo-mobile.lua.tmpl
@@ -0,0 +1,25 @@
+package.path = '${test.lua_support}/?.lua;' .. package.path
+event = require('ms_support')
+send = 1
+
+
+function lu_test_mm_cb(new_state, new_substate, old_substate)
+        if new_state == 19 and new_substate == 1 and send == 1 then
+            send = 0
+            event.send({lu_done=1})
+        end
+end
+
+function mm_cb(new_state, new_substate, old_substate)
+% if test.run_lu_test:
+	lu_test_mm_cb(new_state, new_substate, old_substate)
+% endif
+end
+
+local cbs = {
+        Mm=mm_cb
+}
+osmo.ms():register(cbs)
+osmo.ms().start()
+
+event.register(osmo.ms():number(), "${test.event_path}")
diff --git a/src/osmo_ms_driver/location_update_test.py b/src/osmo_ms_driver/location_update_test.py
index 5ff2199..82c1cb3 100644
--- a/src/osmo_ms_driver/location_update_test.py
+++ b/src/osmo_ms_driver/location_update_test.py
@@ -59,7 +59,7 @@ class MassUpdateLocationTest(log.Origin):
     decides how quickly to start them and a timeout.
     """
 
-    TEMPLATE_LUA = "osmo-mobile-lu.lua"
+    TEMPLATE_LUA = "osmo-mobile.lua"
     TEMPLATE_CFG = "osmo-mobile.cfg"
 
     def __init__(self, name, options, cdf_function,
diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py
index 010947b..20977d6 100644
--- a/src/osmo_ms_driver/starter.py
+++ b/src/osmo_ms_driver/starter.py
@@ -91,6 +91,7 @@ class OsmoMobile(Launcher):
             'test': {
                 'event_path': self._ev_server_path,
                 'lua_support': lua_support,
+                'run_lu_test': True,
             }
         }
         lua_cfg_file = os.path.join(self._tmp_dir, "lua_" + self._name_number + ".lua")
-- 
cgit v1.2.3