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: [PATCH] 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
---
 .../{osmo-mobile-lu.lua.tmpl => osmo-mobile.lua.tmpl}    | 9 ++++++++-
 src/osmo_ms_driver/location_update_test.py               | 2 +-
 src/osmo_ms_driver/starter.py                            | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)
 rename src/osmo_gsm_tester/templates/{osmo-mobile-lu.lua.tmpl => osmo-mobile.lua.tmpl} (73%)

diff --git a/src/osmo_gsm_tester/templates/osmo-mobile-lu.lua.tmpl b/src/osmo_gsm_tester/templates/osmo-mobile.lua.tmpl
similarity index 73%
rename from src/osmo_gsm_tester/templates/osmo-mobile-lu.lua.tmpl
rename to src/osmo_gsm_tester/templates/osmo-mobile.lua.tmpl
index c25d799f..0adb8956 100644
--- a/src/osmo_gsm_tester/templates/osmo-mobile-lu.lua.tmpl
+++ b/src/osmo_gsm_tester/templates/osmo-mobile.lua.tmpl
@@ -2,13 +2,20 @@ package.path = '${test.lua_support}/?.lua;' .. package.path
 event = require('ms_support')
 send = 1
 
-function mm_cb(new_state, new_substate, old_substate)
+
+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
 }
diff --git a/src/osmo_ms_driver/location_update_test.py b/src/osmo_ms_driver/location_update_test.py
index 5ff21997..82c1cb35 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 010947bc..20977d66 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")