Fixed multiple errors.

1 files changed, 11 insertions, 5 deletions

diff --git a/test-cli/test_main.py b/test-cli/test_main.py
index c09d703..48ec534 100644
--- a/test-cli/test_main.py
+++ b/test-cli/test_main.py
@@ -1,4 +1,5 @@
-from test.helpers.get_dieid import genDieid
+from test.helpers.int_registers import get_die_id
+from test.helpers.int_registers import get_mac
 from subprocess import call
 import xml.etree.ElementTree as XMLParser
 import errno
@@ -92,6 +93,8 @@ def add_test_task(suite, testdefname, paramlist):
 def create_testsuite():
     # create an object TestSuite
     suite = unittest.TestSuite()
+    # get id of the full test for this board
+    globalVar.testid_ctl = psdbObj.open_test(globalVar.g_uuid)
     # get list of tests for this board
     tests = psdbObj.get_tests_list(globalVar.g_uuid)
     # loop in every test for this board
@@ -100,11 +103,13 @@ def create_testsuite():
         # get params for this test
         params = psdbObj.get_test_params_list(testid)
         paramlist = create_paramslist(params)
+        # add the testid as parameter
+        paramlist["testid"] = testid
+        paramlist["boarduuid"] = globalVar.g_uuid
+        paramlist["testidctl"] = globalVar.testid_ctl
         # add test to TestSuite
         add_test_task(suite, testdefname, paramlist)
 
-    globalVar.testid_ctl = psdbObj.open_test(globalVar.g_uuid)
-
     return suite
 
 
@@ -118,10 +123,11 @@ def create_board():
     # get station
     globalVar.station = socket.gethostname()
 
-    processor_id = genDieid(globalVar.g_mid)
+    processor_id = get_die_id(globalVar.g_mid)
     print(globalVar.g_mid)
     print(processor_id)
-    globalVar.g_uuid = psdbObj.create_board(processor_id, model_id, variant, globalVar.station, bmac=None)
+    globalVar.g_uuid = psdbObj.create_board(processor_id, model_id, variant, globalVar.station,
+                                            get_mac(globalVar.g_mid))
 
 
 def main():