wiliot-certificate 1.5.1a1__py3-none-any.whl → 1.5.3a1__py3-none-any.whl

brg_certificate/cert_results.py

@@ -1,11 +1,12 @@
 import os
 import tabulate
 import subprocess
+import datetime
 from reportlab.lib import colors
 from reportlab.lib.pagesizes import letter
 from reportlab.platypus import SimpleDocTemplate, Table, TableStyle, Paragraph, Spacer, PageBreak, KeepTogether, Image
 from reportlab.lib.styles import ParagraphStyle
-from reportlab.lib.enums import TA_CENTER, TA_LEFT
+from reportlab.lib.enums import TA_CENTER, TA_LEFT, TA_RIGHT
 
 # Local imports
 import brg_certificate.cert_utils as cert_utils
@@ -17,9 +18,30 @@ from brg_certificate.cert_defines import *
 ##################################
 # GENERIC
 ##################################
+# Defines
+WLT_CERT_HEADLINE =                "Wiliot Certificate Results"
+WLT_CERT_PASS_HEADLINE =           "Wiliot Certificate Passed!"
+WLT_CERT_FAIL_HEADLINE =           "Wiliot Certificate Failed!"
+WLT_CERT_ERROR_HEADLINE =          "Wiliot Certificate Error!"
+SUMMARY_HEADLINE =                 "Summary"
+RUN_INFO =                         "Run Information"
+RUN_DATETIME =                     "Run Time & Date"
+RUN_DUR =                          "Run Duration"
+CERT_VER =                         "Certificate Version"
+TESTING_DEVICE_INFO =              "Testing Device Information"
+TESTED_DEVICE_INFO =               "Tested Device Information"
+SIM =                              "Simulator"
+BRG =                              "Bridge"
+BLE_MAC_ADDRESS =                  "BLE MAC Address"
+BOARD_TYPE =                       "Board Type"
+BLE_VER =                          "BLE Version"
+SUP_API_VER =                      "Supported API Version"
+
 result_map = {TEST_FAILED: cert_prints.color("RED", "FAIL"), TEST_SKIPPED: cert_prints.color("WARNING", "SKIPPED"),
               TEST_PASSED: cert_prints.color("GREEN", "PASS"), TEST_INIT: cert_prints.color("CYAN", "INIT")}
 pass_or_fail = lambda obj : result_map[obj.rc]
+param_name_to_title = lambda s : ' '.join(word.lower().capitalize() for word in s.split('_')).replace('2 4', '2.4') if '_' in s else s
+
 class TestResult:
     def __init__(self, name="", devices_to_print="", test_table=None, result=None, duration=0, purpose="", kb_link="", compliance="", test_skipped=False):
         self.name = name
@@ -78,7 +100,7 @@ def get_update_status_from_log_file(log_file="update_log.txt"):
                     break
     return update_status
 
-def generate_results_files(html=True, pdf=True, failures=0, skipped=0, start_time=0, duration=0, brg=None, internal_brg=None, tests=[], error=None, pipeline=False):
+def generate_results_files(html=True, pdf=True, failures=0, skipped=0, start_time=datetime.datetime.now(), duration=0, brg=None, internal_brg=None, tests=[], error=None, pipeline=False):
     # Generate HTML file
     if html:
         f = open(os.path.join(BASE_DIR, UT_RESULT_FILE_HTML), "w", encoding="utf-8")
@@ -89,38 +111,38 @@ def generate_results_files(html=True, pdf=True, failures=0, skipped=0, start_tim
                                 stdout=subprocess.PIPE, shell=True, cwd=os.environ['BITBUCKET_CLONE_DIR'])
             output, err = p.communicate()
         if error:
-            f.write("<br><h1 style='color:#ab0000'>Wiliot Certificate Error!</h1><br>")
+            f.write(f"<br><h1 style='color:#ab0000'>{WLT_CERT_ERROR_HEADLINE}</h1><br>")
             if pipeline:
                 f.write("<hr>" + output.decode("utf-8") + "<br>")
                 f.write("<p><a href='https://bitbucket.org/wiliot/wiliot-nordic-firmware/commits/{}'>Commit page on bitbucket</a><hr>".format(os.environ['BITBUCKET_COMMIT']))
             f.write(update_status + "<br><br>")
             f.write(error + "<br><br>")
-            f.write("Run duration: {} <br><br>".format(str(duration).split(".")[0]))
+            f.write(f"{RUN_DUR}: {str(duration).split(".")[0]} <br><br>")
             if brg:
-                f.write("Bridge version: {} <br><br>".format(brg.version))
+                f.write(f"{BRG} {BLE_VER}: {brg.version} <br><br>")
         elif tests:
             if not failures and ("successfully!" in update_status or "skipped!" in update_status or not pipeline):
-                f.write("<br><h1 style='color:#00AB83'>Wiliot Certificate Passed!</h1>")
+                f.write(f"<br><h1 style='color:#00AB83'>{WLT_CERT_PASS_HEADLINE}</h1>")
             else:
-                f.write("<br><h1 style='color:#ab0000'>Wiliot Certificate Failed!</h1>")
+                f.write(f"<br><h1 style='color:#ab0000'>{WLT_CERT_FAIL_HEADLINE}</h1>")
             if pipeline:
                 f.write("<hr>" + output.decode("utf-8") + "<br>")
                 f.write("<p><a href='https://bitbucket.org/wiliot/wiliot-nordic-firmware/commits/{}'>Commit page on bitbucket</a><hr>".format(os.environ['BITBUCKET_COMMIT']))
                 f.write(update_status + "<br><br>")
-            f.write("Run date: {} <br><br>".format(start_time.strftime('%d/%m/%Y, %H:%M:%S')))
-            f.write("Tests duration: {} <br><br>".format(str(duration).split(".")[0]))
-            f.write("Certificate version: {} <br><br>".format(CERT_VERSION))
+            f.write(f"{RUN_DATETIME}: {start_time.strftime('%d/%m/%Y, %H:%M:%S')} <br><br>")
+            f.write(f"{RUN_DUR}: {str(duration).split(".")[0]} <br><br>")
+            f.write(f"{CERT_VER}: {CERT_VERSION} <br><br>")
             if internal_brg:
-                f.write("BLE simulator mac: {} <br><br>".format(internal_brg.id_str))
-                f.write("BLE simulator version: {} <br><br>".format(internal_brg.version))
-            f.write("Tested bridge ID: {} <br><br>".format(brg.id_str))
+                f.write(f"{SIM} {BLE_MAC_ADDRESS}: {internal_brg.id_str} <br><br>")
+                f.write(f"{SIM} {BLE_VER}: {internal_brg.version} <br><br>")
             if brg:
-                f.write("Bridge version: {} <br><br>".format(brg.version))
+                f.write(f"{BRG} {BLE_MAC_ADDRESS}: {brg.id_str} <br><br>")
+                f.write(f"{BRG} {BLE_VER}: {brg.version} <br><br>")
             f.write(tabulate.tabulate([[len(tests)-(failures+skipped), skipped, failures, len(tests)]], headers=["PASSED", "SKIPPED", "FAILED", "TOTAL"], tablefmt="html"))
             f.write(generate_tests_table(tests, html=True))
             f.write("<br><br>")
         if pipeline:
-            f.write("<p><a href='https://bitbucket.org/wiliot/wiliot-nordic-firmware/pipelines/results/{}'>Build's page and artifacts on bitbucket</a></p><br><br>".format(os.environ['BITBUCKET_BUILD_NUMBER']))
+            f.write(f"<p><a href='https://bitbucket.org/wiliot/wiliot-nordic-firmware/pipelines/results/{os.environ['BITBUCKET_BUILD_NUMBER']}'>Build's page and artifacts on bitbucket</a></p><br><br>")
         f.write("<img src='https://www.wiliot.com/src/img/svg/logo.svg' width='100' height='40' alt='Wiliot logo'>")
         f.write(HTML_END)
         f.close()
@@ -138,40 +160,42 @@ def generate_results_files(html=True, pdf=True, failures=0, skipped=0, start_tim
 
         # Title and Summary
         red_header = STYLES_PDF.get("RED_HEADER", ParagraphStyle("Default"))
-        green_header = STYLES_PDF.get("GREEN_HEADER", ParagraphStyle("Default"))
+        black_header = STYLES_PDF.get("BLACK_HEADER", ParagraphStyle("Default"))
         module_header = STYLES_PDF.get("MODULE_HEADER", ParagraphStyle("Default"))
         test_header = STYLES_PDF.get("TEST_LINK_HEADER", ParagraphStyle("Default"))
         test_purpose = STYLES_PDF.get("TEST_HEADER", ParagraphStyle("Default"))
         bold_text_style = STYLES_PDF.get("BLACK_BOLD", ParagraphStyle("Default"))
+        bold_right_text_style = STYLES_PDF.get("BLUE_BOLD_RIGHT", ParagraphStyle("Default"))
         centered_text_style = STYLES_PDF.get("BLACK", ParagraphStyle("Default"))
         if error:
-            title = Paragraph("<b>Wiliot Certificate Error!</b>", red_header)
+            title = Paragraph(f"<b>{WLT_CERT_ERROR_HEADLINE}</b>", red_header)
             hdr_page.append(title)
             hdr_page.append(Spacer(1, 20))
             hdr_page.append(Paragraph(f"{error}", bold_text_style))
         else:
-            title = Paragraph("<b>Wiliot Certificate Passed!</b>", green_header) if not failures else Paragraph("<b>Wiliot Certificate Failed!</b>", red_header)
+            title = Paragraph(f"<b>{WLT_CERT_HEADLINE}</b>", black_header)
             hdr_page.append(title)
         hdr_page.append(Spacer(1, 20))
-        hdr_page.append(Paragraph(f"<b>Summary</b>", module_header))
+        hdr_page.append(Paragraph(f"<a name='{SUMMARY_HEADLINE}'/><b>{SUMMARY_HEADLINE}</b>", module_header))
         hdr_page.append(Spacer(1, 20))
-        hdr_page.append(Paragraph("<u>Run Info:</u>", bold_text_style))
-        hdr_page.append(Paragraph(f"Run date: {start_time.strftime('%d/%m/%Y, %H:%M:%S')}", bold_text_style))
-        hdr_page.append(Paragraph(f"Tests duration: {str(duration).split('.')[0]}", bold_text_style))
-        hdr_page.append(Paragraph(f"Certificate version: {CERT_VERSION}", bold_text_style))
+        hdr_page.append(Paragraph(f"<u>{RUN_INFO}:</u>", bold_text_style))
+        hdr_page.append(Paragraph(f"{RUN_DATETIME}: {start_time.strftime('%d/%m/%Y, %H:%M:%S')}", bold_text_style))
+        hdr_page.append(Paragraph(f"{RUN_DUR}: {str(duration).split('.')[0]}", bold_text_style))
+        hdr_page.append(Paragraph(f"{CERT_VER}: {CERT_VERSION}", bold_text_style))
         hdr_page.append(Spacer(1, 10))
-        hdr_page.append(Paragraph("<u>Testing Device Info:</u>", bold_text_style))
-        if internal_brg:
-            hdr_page.append(Paragraph(f"BLE simulator mac: {internal_brg.id_str}", bold_text_style))
-            hdr_page.append(Paragraph(f"BLE simulator version: {internal_brg.version}", bold_text_style))
-            hdr_page.append(Paragraph(f"BLE simulator supported API version: {internal_brg.api_version}", bold_text_style))
-        hdr_page.append(Spacer(1, 10))
-        hdr_page.append(Paragraph("<u>Tested Device Info:</u>", bold_text_style))
         if brg:
-            hdr_page.append(Paragraph(f"Tested bridge ID: {brg.id_str}", bold_text_style))
-            hdr_page.append(Paragraph(f"Tested bridge board type: {ag.BOARD_TYPES_LIST[brg.board_type]}", bold_text_style))
-            hdr_page.append(Paragraph(f"Tested bridge BLE version: {brg.version}", bold_text_style))
-            hdr_page.append(Paragraph(f"Tested bridge supported API version: {brg.api_version}", bold_text_style))
+            hdr_page.append(Paragraph(f"<u>{TESTED_DEVICE_INFO}:</u>", bold_text_style))
+            hdr_page.append(Paragraph(f"{BRG} {BLE_MAC_ADDRESS}: {brg.id_str}", bold_text_style))
+            hdr_page.append(Paragraph(f"{BRG} {BOARD_TYPE}: {ag.BOARD_TYPES_LIST[brg.board_type]}", bold_text_style))
+            hdr_page.append(Paragraph(f"{BRG} {BLE_VER}: {brg.version}", bold_text_style))
+            hdr_page.append(Paragraph(f"{BRG} {SUP_API_VER}: {brg.api_version}", bold_text_style))
+            hdr_page.append(Spacer(1, 10))
+        if internal_brg:
+            hdr_page.append(Paragraph(f"<u>{TESTING_DEVICE_INFO}:</u>", bold_text_style))
+            hdr_page.append(Paragraph(f"{SIM} {BLE_MAC_ADDRESS}: {internal_brg.id_str}", bold_text_style))
+            hdr_page.append(Paragraph(f"{SIM} {BOARD_TYPE}: {ag.BOARD_TYPES_LIST[internal_brg.board_type]}", bold_text_style))
+            hdr_page.append(Paragraph(f"{SIM} {BLE_VER}: {internal_brg.version}", bold_text_style))
+            hdr_page.append(Paragraph(f"{SIM} {SUP_API_VER}: {internal_brg.api_version}", bold_text_style))
         hdr_page.append(Spacer(1, 20))
 
         # Count Table
@@ -180,7 +204,7 @@ def generate_results_files(html=True, pdf=True, failures=0, skipped=0, start_tim
             [len(tests)-(failures+skipped), skipped, failures, len(tests)]
         ]
         count_table = Table(count_data)
-        count_table.setStyle(INNER_TABLE_STYLE)
+        count_table.setStyle(inner_table_style('CENTER'))
         hdr_page.append(count_table)
         hdr_page.append(Spacer(1, 20))
 
@@ -190,31 +214,33 @@ def generate_results_files(html=True, pdf=True, failures=0, skipped=0, start_tim
         for module, test_results in results_per_module.items():
             module_objects = []
             module_skipped = True # Remains True if all tests are skipped
-            module_objects.append(Paragraph(f"<b>{module + ' Module' if module else 'Edge Management'}</b>", module_header))
+            module_objects.append(Paragraph(f"<b>{module + ' Module' if not 'Edge' in module else module}</b>", module_header))
             module_objects.append(Spacer(1, 20))
             for test_result in test_results:
                 test_objects = []
-                name = Paragraph(f'<a href="#{test_result.name}">{test_result.name}</a>', centered_text_style) if not test_result.test_skipped else test_result.name
+                name = Paragraph(f'<a href="#{module}_{test_result.name}">{test_result.name}</a>', centered_text_style) if not test_result.test_skipped else test_result.name
                 summary_data += [[module, name, test_result.result, test_result.compliance]]
-                test_objects.append(Paragraph(f'<a name="{test_result.name}"/><a href="{test_result.kb_link}">{test_result.name}</a>', test_header))
-                test_objects.append(Spacer(1, 10))
-                test_objects.append(Paragraph(test_result.purpose, test_purpose))
+                test_objects.append(Paragraph(f'<a name="{module}_{test_result.name}"/><a href="{test_result.kb_link}">{test_result.name}</a>', test_header))
                 test_objects.append(Spacer(1, 10))
                 test_objects.append(test_result.result)
                 test_objects.append(Spacer(1, 10))
+                test_objects.append(Paragraph(test_result.purpose, test_purpose))
+                test_objects.append(Spacer(1, 10))
                 if not test_result.test_skipped:
                     module_skipped = False # Set to False if at least one test isn't skipped
                     test_objects.append(Paragraph(f"Tested devices: {test_result.devices}", bold_text_style))
                     test_objects.append(Paragraph(f"Test duration: {test_result.duration}", bold_text_style))
                     test_objects.append(Spacer(1, 10))
                     test_objects.append(test_result.test_table)
+                    test_objects.append(Spacer(1, 10))
+                    test_objects.append(Paragraph(f"<a href='#{SUMMARY_HEADLINE}'>Back to {SUMMARY_HEADLINE}</a>", bold_right_text_style))
                     test_objects.append(Spacer(1, 20))
                 module_objects.append(KeepTogether(test_objects))
             if not module_skipped:
                 elements += module_objects
                 elements.append(PageBreak())
         summary_table = Table([["Module", "Name", "Result", "Compliance"]] + summary_data)
-        summary_table.setStyle(INNER_TABLE_STYLE)
+        summary_table.setStyle(inner_table_style('LEFT'))
         elements = hdr_page + [summary_table, PageBreak()] + elements
 
         doc.build(elements)
@@ -297,18 +323,19 @@ HTML_END = """
 # PDF
 ##################################
 STYLES_PDF = {
-    "GREEN_HEADER": ParagraphStyle("Green Header", fontName="Helvetica-Bold", fontSize=20, textColor=colors.green, alignment=TA_CENTER),
+    "BLACK_HEADER": ParagraphStyle("Black Header", fontName="Helvetica-Bold", fontSize=20, textColor=colors.black, alignment=TA_CENTER),
     "RED_HEADER": ParagraphStyle("Red Header", fontName="Helvetica-Bold", fontSize=20, textColor=colors.red, alignment=TA_CENTER),
     "MODULE_HEADER": ParagraphStyle("Module Header", fontName="Helvetica-Bold", fontSize=16, textColor=colors.navy, alignment=TA_CENTER),
-    "TEST_HEADER": ParagraphStyle("Test Header", fontName="Helvetica-Bold", fontSize=12, textColor=colors.black, alignment=TA_CENTER),
-    "TEST_LINK_HEADER": ParagraphStyle('Test Link Header', fontName="Helvetica-Bold", fontSize=14, textColor=colors.blue, underline=True, alignment=TA_CENTER),
-    "BLACK": ParagraphStyle("Black", fontName="Helvetica", fontSize=9, textColor=colors.black, splitLongWords=False, alignment=TA_CENTER, wordWrap = 'CJK'),
+    "TEST_HEADER": ParagraphStyle("Test Header", fontName="Helvetica-Bold", fontSize=12, textColor=colors.black, alignment=TA_LEFT),
+    "TEST_LINK_HEADER": ParagraphStyle('Test Link Header', fontName="Helvetica-Bold", fontSize=14, textColor=colors.blue, alignment=TA_LEFT),
+    "BLACK": ParagraphStyle("Black", fontName="Helvetica", fontSize=9, textColor=colors.black, splitLongWords=False, alignment=TA_LEFT, wordWrap = 'CJK'),
     "BLACK_BOLD": ParagraphStyle("Black Bold", fontName="Helvetica-Bold", fontSize=9, textColor=colors.black, splitLongWords=False, alignment=TA_LEFT, wordWrap = 'CJK'),
+    "BLUE_BOLD_RIGHT": ParagraphStyle("Black Bold", fontName="Helvetica-Bold", fontSize=9, textColor=colors.blue, splitLongWords=False, alignment=TA_RIGHT, wordWrap = 'CJK'),
     "BLUE": ParagraphStyle("Blue", fontName="Helvetica-Bold", fontSize=9, textColor=colors.navy, splitLongWords=False, alignment=TA_CENTER),
-    "CYAN": ParagraphStyle("Cyan", fontName="Helvetica-Bold", fontSize=9, textColor=colors.cyan, splitLongWords=False, alignment=TA_CENTER),
-    "GREEN": ParagraphStyle("Green", fontName="Helvetica-Bold", fontSize=9, textColor=colors.green, splitLongWords=False, alignment=TA_CENTER),
-    "WARNING": ParagraphStyle("Warning", fontName="Helvetica-Bold", fontSize=9, textColor=colors.gold, splitLongWords=False, alignment=TA_CENTER),
-    "RED": ParagraphStyle("Red", fontName="Helvetica-Bold", fontSize=9, textColor=colors.red, splitLongWords=False, alignment=TA_CENTER),
+    "CYAN": ParagraphStyle("Cyan", fontName="Helvetica-Bold", fontSize=9, textColor=colors.cyan, splitLongWords=False, alignment=TA_LEFT),
+    "GREEN": ParagraphStyle("Green", fontName="Helvetica-Bold", fontSize=9, textColor=colors.green, splitLongWords=False, alignment=TA_LEFT),
+    "WARNING": ParagraphStyle("Warning", fontName="Helvetica-Bold", fontSize=9, textColor=colors.gold, splitLongWords=False, alignment=TA_LEFT),
+    "RED": ParagraphStyle("Red", fontName="Helvetica-Bold", fontSize=9, textColor=colors.red, splitLongWords=False, alignment=TA_LEFT),
 }
 def color_pdf(c, t):
     style = STYLES_PDF.get(c, ParagraphStyle("Default"))
@@ -317,17 +344,17 @@ pdf_result_map = {TEST_FAILED: color_pdf("RED", "FAILED"), TEST_SKIPPED: color_p
                   TEST_PASSED: color_pdf("GREEN", "PASSED"),  TEST_INIT: color_pdf("CYAN", "INIT")}
 pass_or_fail_pdf = lambda obj : pdf_result_map[obj.rc]
 
-INNER_TABLE_STYLE = TableStyle([
-                ('BACKGROUND', (0, 0), (-1, 0), colors.grey),
-                ('TEXTCOLOR', (0, 0), (-1, 0), colors.whitesmoke),
-                ('ALIGN', (0, 0), (-1, -1), 'CENTER'),
-                ('VALIGN', (0, 0), (-1, -1), 'MIDDLE'),
-                ('FONTNAME', (0, 0), (-1, 0), 'Helvetica-Bold'),
-                ('FONTSIZE', (0, 0), (-1, 0), 9),
-                ('BOTTOMPADDING', (0, 0), (-1, 0), 12),
-                ('BACKGROUND', (0, 1), (-1, -1), colors.whitesmoke),
-                ('WORDWRAP', (0, 0), (-1, -1), False),
-            ])
+inner_table_style = lambda align :  TableStyle([
+                                    ('BACKGROUND', (0, 0), (-1, 0), colors.grey),
+                                    ('TEXTCOLOR', (0, 0), (-1, 0), colors.whitesmoke),
+                                    ('ALIGN', (0, 0), (-1, -1), f'{align}'),
+                                    ('VALIGN', (0, 0), (-1, -1), 'MIDDLE'),
+                                    ('FONTNAME', (0, 0), (-1, 0), 'Helvetica-Bold'),
+                                    ('FONTSIZE', (0, 0), (-1, 0), 9),
+                                    ('BOTTOMPADDING', (0, 0), (-1, 0), 12),
+                                    ('BACKGROUND', (0, 1), (-1, -1), colors.whitesmoke),
+                                    ('WORDWRAP', (0, 0), (-1, -1), False),
+                                ])
 
 def generate_results_per_module_for_pdf(tests=[]):
     text_style = STYLES_PDF.get("BLACK", ParagraphStyle("Default"))
@@ -335,14 +362,14 @@ def generate_results_per_module_for_pdf(tests=[]):
     for test in tests:
         devices_to_print = (test.gw if not test.brg0 or test.gw_only else
                         (f"{test.brg0.id_str}\n{test.brg1.id_str}" if test.brg1 and test.multi_brg else test.brg0.id_str))
-        inner_table = [[Paragraph(phase.name, text_style), pass_or_fail_pdf(phase), Paragraph(phase.reason, text_style)] for phase in test.phases]
+        inner_table = [[Paragraph(param_name_to_title(phase.name), text_style), pass_or_fail_pdf(phase), Paragraph(phase.reason, text_style)] for phase in test.phases]
         test_table = Table([["Phase", "Result", "Notes"]] + inner_table)
-        test_table.setStyle(INNER_TABLE_STYLE)
+        test_table.setStyle(inner_table_style('LEFT'))
         compliance = "Mandatory" if test.test_json[MANDATORY] else "Optional"
-        test_result = TestResult(name=test.module_name, devices_to_print=devices_to_print, test_table=test_table, result=pass_or_fail_pdf(test),
+        test_result = TestResult(name=test.test_json[NAME], devices_to_print=devices_to_print, test_table=test_table, result=pass_or_fail_pdf(test),
                                  duration=test.duration, purpose=str(test.test_json[PURPOSE]), compliance=compliance,
                                  kb_link=test.test_json[DOCUMENTATION], test_skipped=(test.rc == TEST_SKIPPED))
-        module_name = cert_utils.module2name(test.test_module)
+        module_name = test.test_json[MODULE]
         if module_name not in results_per_module:
                 results_per_module[module_name] = [test_result]
         else:

brg_certificate/cert_utils.py

@@ -25,7 +25,7 @@ ORIGINAL_AG_FILE = "wlt_types_ag.py"
 TEST_MODULES_MAP = {"calibration": ag.MODULE_CALIBRATION, "datapath": ag.MODULE_DATAPATH, "energy2400": ag.MODULE_ENERGY_2400, "energy_sub1g": ag.MODULE_ENERGY_SUB1G,
                     "pwr_mgmt": ag.MODULE_PWR_MGMT, "sensors": ag.MODULE_EXT_SENSORS, "custom": ag.MODULE_CUSTOM}
 
-STATIC_RANDOM_ADDR_MASK = 0x0000000000C0
+STATIC_RANDOM_ADDR_MASK = 0xC00000000000
 hex2alias_id_get = lambda id_str: cert_common.int2mac_get(int(id_str, 16) | STATIC_RANDOM_ADDR_MASK)
 
 def module2name(module_id):
@@ -43,7 +43,7 @@ def load_module(module_name, module_path, rel_path="."):
 def handle_error(error, start_time):
     utPrint(error, "red")
     duration = (datetime.datetime.now()-start_time)
-    cert_results.generate_results_files(html=True, pdf=True, start_time=start_time, duration=duration, error=error, pipeline=cert_common.pipeline_running())
+    cert_results.generate_results_files(html=True, pdf=False, start_time=start_time, duration=duration, error=error, pipeline=cert_common.pipeline_running())
     sys.exit(-1)
 
 ##################################
@@ -56,7 +56,12 @@ class WltTest:
         if line:
             test_list_line = line.strip().split()
             self.name = test_list_line[0]
-            self.test_module = TEST_MODULES_MAP[self.name.split('/')[0]] if self.name.split('/')[0] in TEST_MODULES_MAP else ag.MODULE_EMPTY
+            self.test_module = ag.MODULE_EMPTY # Default test module
+            # Determine test's module
+            for s in self.name.split('/'):
+                if s in TEST_MODULES_MAP:
+                    self.test_module = TEST_MODULES_MAP[s]
+                    break
             line_params = test_list_line[1:]
             self.dir = os.path.join("tests", self.name)
             self.module_name = os.path.join(os.path.basename(self.name))
@@ -80,6 +85,7 @@ class WltTest:
         self.internal_brg_obj = internal_brg_obj
         # Actual brg to cfg - can be brg0 or brg1
         self.active_brg = brg0
+        self.ab = self.active_brg  # alias name
         self.brg0 = brg0
         self.brg1 = brg1
         self.rc = TEST_PASSED
@@ -227,6 +233,7 @@ class Bridge:
                     if module in TEST_MODULES_MAP:
                         self.sup_caps += [TEST_MODULES_MAP[module]]
                         self.modules += [eval_pkt(ag.MODULES_DICT[TEST_MODULES_MAP[module]] + str(self.api_version))]
+                        setattr(self, module, eval_pkt(ag.MODULES_DICT[TEST_MODULES_MAP[module]] + str(self.api_version)))
 
     def update_modules(self):
         self.modules = []
@@ -269,9 +276,9 @@ def handle_prep_brg_for_latest(test, interface, start_time):
 def ut_prep_brg(args, mqttc, start_time, gw, brg, gw_server, protobuf):
     brg = Bridge(brg)
     utPrint(SEP)
-    if not args.port:
+    if not cert_common.is_cert_running:
         versions_mgmt = load_module('versions_mgmt.py', f'{UTILS_BASE_REL_PATH}/versions_mgmt.py')
-        brg_owner = versions_mgmt.gw_brg_owner(env="aws", server="prod", brg=brg.id_str)
+        brg_owner = versions_mgmt.gw_brg_owner(env=AWS, server=PROD, brg=brg.id_str)
         if brg_owner and not brg_owner in r_codes:
             print_warn(f"BRG {brg.id_str} owned by account {brg_owner}")
     test = WltTest("", gw, mqttc, brg0=brg, gw_lan=args.lan, server=gw_server, exit_on_param_failure=args.exit_on_param_failure,

brg_certificate/certificate_bcc_sanity_test_list.txt

@@ -1,9 +1,12 @@
 # The certificate should run for every bridge change
-# The setup will include 1 tested BRG + 1 GW connected with UART
-# python ut.py --gw SIM --brg <XXXXXXXXXXXX> --tl certificate_sanity_test_list.txt --data sim --port <COM_PORT>
+# The setup will include 1 tested BRG with cloud connectivity + 1 GW connected with UART or remotely
+# Run command example with COM PORT connection:
+# python brg_certificate_cli.py --gw SIM --brg_cloud_connectivity <XXXXXXXXXXXX> --tl certificate_bcc_sanity_test_list.txt --data sim --port <COM_PORT>
+# Run command example with remote GW connection:
+# python brg_certificate_cli.py --gw <GWYYYYYYYYYYYY> --brg_cloud_connectivity <XXXXXXXXXXXX> --tl certificate_bcc_sanity_test_list.txt --data sim
 
 # ------------- edge_mgmt -------------
-edge_mgmt/stat_test
+edge_mgmt/periodic_msgs_test
 edge_mgmt/actions_test ACTION_GW_HB ACTION_BLINK ACTION_SEND_HB ACTION_GET_BATTERY_SENSOR ACTION_GET_POF_DATA ACTION_PL_STATUS ACTION_GET_MODULE ACTION_REBOOT ACTION_RESTORE_DEFAULTS
 
 # ------------- energy2400 -------------
@@ -28,8 +31,10 @@ datapath/rx_channel_test RX_CHANNEL_37 RX_CHANNEL_38 RX_CHANNEL_10_250K RX_CHANN
 datapath/aging_test low_pacer
 datapath/num_of_tags_test 500
 
-
 # ------------- calibration -------------
 calibration/output_power_test -12 0 3
 calibration/interval_test 1 25 50
-calibration/pattern_test CALIBRATION_PATTERN_38_38_39 CALIBRATION_PATTERN_DISABLE_BEACON
+calibration/pattern_test CALIBRATION_PATTERN_38_38_39 CALIBRATION_PATTERN_DISABLE_BEACON
+
+# ------------- sensors -------------
+sensors/ext_sensor_test tag_data_only rssi_threshold snsr0_scrmbl_snsr1_no_scrmbl

brg_certificate/certificate_bcc_test_list.txt

@@ -1,13 +1,12 @@
 # The certificate should run for every bridge change
-# The setup will include 1 tested BRG + 1 GW connected with UART
-# Run command example:
-# python ut.py --gw SIM --brg <XXXXXXXXXXXX> --tl certificate_test_list.txt --data sim --port <COM_PORT>
-
-# ------------- pwr_mgmt -------------
-ut/pwr_mgmt/pwr_mgmt_test
+# The setup will include 1 tested BRG with cloud connectivity + 1 GW connected with UART or remotely
+# Run command example with COM PORT connection:
+# python brg_certificate_cli.py --gw SIM --brg_cloud_connectivity <XXXXXXXXXXXX> --tl certificate_bcc_test_list.txt --data sim --port <COM_PORT>
+# Run command example with remote GW connection:
+# python brg_certificate_cli.py --gw <GWYYYYYYYYYYYY> --brg_cloud_connectivity <XXXXXXXXXXXX> --tl certificate_bcc_test_list.txt --data sim
 
 # ------------- edge_mgmt -------------
-edge_mgmt/stat_test
+edge_mgmt/periodic_msgs_test
 edge_mgmt/actions_test ACTION_GW_HB ACTION_BLINK ACTION_SEND_HB ACTION_GET_BATTERY_SENSOR ACTION_GET_POF_DATA ACTION_PL_STATUS ACTION_GET_MODULE ACTION_REBOOT ACTION_RESTORE_DEFAULTS
 
 # ------------- energy2400 -------------
@@ -15,8 +14,8 @@ energy2400/pattern_test ENERGY_PATTERN_2_4_NO_ENERGIZING ENERGY_PATTERN_2_4_CHAN
 energy2400/output_power_test -12 -8 -4 0 2 3
 energy2400/duty_cycle_test 1 25 50 75
 energy2400/signal_indicator_test internal_brg rssi_threshold brg0_rx_brg1_tx brg0_none_brg1_rx brg0_rxtx_brg1_rxtx brg0_tx_brg1_none
-energy2400/signal_indicator_ble5_10_500k_test internal_brg rssi_threshold brg0_rx_brg1_tx brg0_none_brg1_rx brg0_rxtx_brg1_rxtx brg0_tx_brg1_none
-energy2400/signal_indicator_ble5_10_250k_test internal_brg rssi_threshold brg0_rx_brg1_tx brg0_none_brg1_rx brg0_rxtx_brg1_rxtx brg0_tx_brg1_none 
+energy2400/signal_indicator_ble5_10_500k_test internal_brg rssi_threshold brg0_tx_brg1_rx brg0_none_brg1_rx brg0_rxtx_brg1_rxtx brg0_tx_brg1_none
+energy2400/signal_indicator_ble5_10_250k_test internal_brg rssi_threshold brg0_tx_brg1_rx brg0_none_brg1_rx brg0_rxtx_brg1_rxtx brg0_tx_brg1_none
 
 # ------------- energy_sub1g -------------
 energy_sub1g/pattern_test SUB1G_ENERGY_PATTERN_NO_ENERGIZING SUB1G_ENERGY_PATTERN_SINGLE_TONE_915000 SUB1G_ENERGY_PATTERN_FCC_HOPPING SUB1G_ENERGY_PATTERN_SINGLE_TONE_917500 SUB1G_ENERGY_PATTERN_NZ_HOPPING
@@ -32,14 +31,20 @@ datapath/pacer_interval_ble5_test 5 15 30 60
 datapath/pkt_filter_test PKT_FILTER_RANDOM_FIRST_ARRIVING_PKT PKT_FILTER_DISABLE_FORWARDING PKT_FILTER_TEMP_PKT PKT_FILTER_ADVANCED_PKT PKT_FILTER_TEMP_AND_ADVANCED_PKTS PKT_FILTER_TEMP_ADVANCED_AND_DEBUG_PKTS
 datapath/pkt_filter_gen3_test PKT_FILTER_RANDOM_FIRST_ARRIVING_PKT PKT_FILTER_DISABLE_FORWARDING PKT_FILTER_TEMP_PKT PKT_FILTER_ADVANCED_PKT PKT_FILTER_TEMP_AND_ADVANCED_PKTS
 datapath/pkt_filter_ble5_test PKT_FILTER_RANDOM_FIRST_ARRIVING_PKT PKT_FILTER_DISABLE_FORWARDING PKT_FILTER_TEMP_PKT PKT_FILTER_ADVANCED_PKT PKT_FILTER_TEMP_AND_ADVANCED_PKTS
-#datapath/rx_channel_test RX_CHANNEL_37 RX_CHANNEL_38 RX_CHANNEL_39 RX_CHANNEL_10_250K RX_CHANNEL_10_500K
+datapath/rx_channel_test RX_CHANNEL_37 RX_CHANNEL_38 RX_CHANNEL_39 RX_CHANNEL_10_250K RX_CHANNEL_10_500K
 datapath/rx_rate_gen2_test mid_values diff_pacer min_value max_value  diff_rate
 datapath/rx_rate_gen3_test mid_values diff_pacer min_value max_value  diff_rate
-datapath/aging_test low_pacer high_pacer 
 datapath/pacer_interval_tags_count_test 1 10 15 30
+datapath/aging_test low_pacer high_pacer
 datapath/num_of_tags_test 5000
 
+# ------------- pwr_mgmt -------------
+pwr_mgmt/pwr_mgmt_test
+
 # ------------- calibration -------------
 calibration/output_power_test -12 -8 -4 0 2 3
 calibration/interval_test 1 25 50
 calibration/pattern_test CALIBRATION_PATTERN_38_38_39 CALIBRATION_PATTERN_STANDARD CALIBRATION_PATTERN_EU_PATTERN CALIBRATION_PATTERN_DISABLE_BEACON
+
+# ------------- sensors -------------
+sensors/ext_sensor_test tag_data_only rssi_threshold snsr0_no_scrmbl snsr1_scrmbl snsr0_scrmbl_snsr1_no_scrmbl snsr0_scrmbl_snsr1_scrmbl

brg_certificate/certificate_sanity_test_list.txt

@@ -1,9 +1,12 @@
 # The certificate should run for every bridge change
-# The setup will include 1 tested BRG + 1 GW connected with UART
-# python ut.py --gw SIM --brg <XXXXXXXXXXXX> --tl certificate_sanity_test_list.txt --data sim --port <COM_PORT>
+# The setup will include 1 tested BRG + 1 GW connected with UART or remotely
+# Run command example with COM PORT connection:
+# python brg_certificate_cli.py --gw SIM --brg <XXXXXXXXXXXX> --tl certificate_sanity_test_list.txt --data sim --port <COM_PORT>
+# Run command example with remote GW connection:
+# python brg_certificate_cli.py --gw <GWYYYYYYYYYYYY> --brg <XXXXXXXXXXXX> --tl certificate_sanity_test_list.txt --data sim
 
 # ------------- edge_mgmt -------------
-edge_mgmt/stat_test
+edge_mgmt/periodic_msgs_test
 edge_mgmt/actions_test ACTION_GW_HB ACTION_BLINK ACTION_SEND_HB ACTION_GET_BATTERY_SENSOR ACTION_GET_POF_DATA ACTION_PL_STATUS ACTION_GET_MODULE ACTION_REBOOT ACTION_RESTORE_DEFAULTS
 
 # ------------- energy2400 -------------
@@ -34,4 +37,7 @@ datapath/num_of_tags_test 500
 # ------------- calibration -------------
 calibration/output_power_test -12 0 3
 calibration/interval_test 1 25 50
-calibration/pattern_test CALIBRATION_PATTERN_38_38_39 CALIBRATION_PATTERN_DISABLE_BEACON
+calibration/pattern_test CALIBRATION_PATTERN_38_38_39 CALIBRATION_PATTERN_DISABLE_BEACON
+
+# ------------- sensors -------------
+sensors/ext_sensor_test tag_data_only rssi_threshold snsr0_scrmbl_snsr1_no_scrmbl

brg_certificate/certificate_test_list.txt

@@ -1,13 +1,12 @@
 # The certificate should run for every bridge change
-# The setup will include 1 tested BRG + 1 GW connected with UART
-# Run command example:
-# python ut.py --gw SIM --brg <XXXXXXXXXXXX> --tl certificate_test_list.txt --data sim --port <COM_PORT>
-
-# ------------- pwr_mgmt -------------
-ut/pwr_mgmt/pwr_mgmt_test
+# The setup will include 1 tested BRG + 1 GW connected with UART or remotely
+# Run command example with COM PORT connection:
+# python brg_certificate_cli.py --gw SIM --brg <XXXXXXXXXXXX> --tl certificate_test_list.txt --data sim --port <COM_PORT>
+# Run command example with remote GW connection:
+# python brg_certificate_cli.py --gw <GWYYYYYYYYYYYY> --brg <XXXXXXXXXXXX> --tl certificate_test_list.txt --data sim
 
 # ------------- edge_mgmt -------------
-edge_mgmt/stat_test
+edge_mgmt/periodic_msgs_test
 edge_mgmt/actions_test ACTION_GW_HB ACTION_BLINK ACTION_SEND_HB ACTION_GET_BATTERY_SENSOR ACTION_GET_POF_DATA ACTION_PL_STATUS ACTION_GET_MODULE ACTION_REBOOT ACTION_RESTORE_DEFAULTS
 
 # ------------- energy2400 -------------
@@ -15,8 +14,8 @@ energy2400/pattern_test ENERGY_PATTERN_2_4_NO_ENERGIZING ENERGY_PATTERN_2_4_CHAN
 energy2400/output_power_test -12 -8 -4 0 2 3
 energy2400/duty_cycle_test 1 25 50 75
 energy2400/signal_indicator_test internal_brg rssi_threshold brg0_rx_brg1_tx brg0_none_brg1_rx brg0_rxtx_brg1_rxtx brg0_tx_brg1_none
-energy2400/signal_indicator_ble5_10_500k_test internal_brg rssi_threshold brg0_rx_brg1_tx brg0_none_brg1_rx brg0_rxtx_brg1_rxtx brg0_tx_brg1_none
-energy2400/signal_indicator_ble5_10_250k_test internal_brg rssi_threshold brg0_rx_brg1_tx brg0_none_brg1_rx brg0_rxtx_brg1_rxtx brg0_tx_brg1_none 
+energy2400/signal_indicator_ble5_10_500k_test internal_brg rssi_threshold brg0_tx_brg1_rx brg0_none_brg1_rx brg0_tx_brg1_none
+energy2400/signal_indicator_ble5_10_250k_test internal_brg rssi_threshold brg0_tx_brg1_rx brg0_none_brg1_rx brg0_tx_brg1_none
 
 # ------------- energy_sub1g -------------
 energy_sub1g/pattern_test SUB1G_ENERGY_PATTERN_NO_ENERGIZING SUB1G_ENERGY_PATTERN_SINGLE_TONE_915000 SUB1G_ENERGY_PATTERN_FCC_HOPPING SUB1G_ENERGY_PATTERN_SINGLE_TONE_917500 SUB1G_ENERGY_PATTERN_NZ_HOPPING
@@ -33,7 +32,7 @@ datapath/pacer_interval_ble5_test 5 15 30 60
 datapath/pkt_filter_test PKT_FILTER_RANDOM_FIRST_ARRIVING_PKT PKT_FILTER_DISABLE_FORWARDING PKT_FILTER_TEMP_PKT PKT_FILTER_ADVANCED_PKT PKT_FILTER_TEMP_AND_ADVANCED_PKTS PKT_FILTER_TEMP_ADVANCED_AND_DEBUG_PKTS
 datapath/pkt_filter_gen3_test PKT_FILTER_RANDOM_FIRST_ARRIVING_PKT PKT_FILTER_DISABLE_FORWARDING PKT_FILTER_TEMP_PKT PKT_FILTER_ADVANCED_PKT PKT_FILTER_TEMP_AND_ADVANCED_PKTS
 datapath/pkt_filter_ble5_test PKT_FILTER_RANDOM_FIRST_ARRIVING_PKT PKT_FILTER_DISABLE_FORWARDING PKT_FILTER_TEMP_PKT PKT_FILTER_ADVANCED_PKT PKT_FILTER_TEMP_AND_ADVANCED_PKTS
-#datapath/rx_channel_test RX_CHANNEL_37 RX_CHANNEL_38 RX_CHANNEL_39 RX_CHANNEL_10_250K RX_CHANNEL_10_500K
+datapath/rx_channel_test RX_CHANNEL_37 RX_CHANNEL_38 RX_CHANNEL_39 RX_CHANNEL_10_250K RX_CHANNEL_10_500K
 datapath/rx_rate_gen2_test mid_values diff_pacer min_value max_value  diff_rate
 datapath/rx_rate_gen3_test mid_values diff_pacer min_value max_value  diff_rate
 datapath/pacer_interval_tags_count_test 1 10 15 30
@@ -42,8 +41,13 @@ datapath/stress_gen3_test rep3 rep2 rep1 rep1_adaptive_pacer pixel_burst
 datapath/aging_test low_pacer high_pacer
 datapath/num_of_tags_test 5000
 
+# ------------- pwr_mgmt -------------
+pwr_mgmt/pwr_mgmt_test
 
 # ------------- calibration -------------
 calibration/output_power_test -12 -8 -4 0 2 3
 calibration/interval_test 1 25 50
 calibration/pattern_test CALIBRATION_PATTERN_38_38_39 CALIBRATION_PATTERN_STANDARD CALIBRATION_PATTERN_EU_PATTERN CALIBRATION_PATTERN_DISABLE_BEACON
+
+# ------------- sensors -------------
+sensors/ext_sensor_test tag_data_only rssi_threshold snsr0_no_scrmbl snsr1_scrmbl snsr0_scrmbl_snsr1_no_scrmbl snsr0_scrmbl_snsr1_scrmbl

brg_certificate/tests/calibration/interval_test/interval_test.json

@@ -1,6 +1,6 @@
 {
-    "name": "interval_test",
-    "module": "calibration",
+    "name": "Interval",
+    "module": "Calibration",
     "purpose": "Test configuration for all supported calibration interval values",
     "documentation": "https://community.wiliot.com/customers/s/article/Wiliot-Network-Calibration-Module",
     "initialCondition": "Bridge configured to defaults",

brg_certificate/tests/calibration/interval_test/interval_test.py

@@ -8,7 +8,7 @@ import brg_certificate.cert_config as cert_config
 def run(test):
 
     fields = [BRG_CALIB_INTERVAL]
-    calib_module = eval_pkt(f'ModuleCalibrationV{test.active_brg.api_version}')
+    calib_module = test.active_brg.calibration
 
     test = cert_common.test_prolog(test)
     if test.rc == TEST_FAILED:

brg_certificate/tests/calibration/output_power_test/output_power_test.json

@@ -1,6 +1,6 @@
 {
-    "name": "output_power_test",
-    "module": "calibration",
+    "name": "Output Power",
+    "module": "Calibration",
     "purpose": "Test configuration for all supported calibration output power values",
     "documentation": "https://community.wiliot.com/customers/s/article/Wiliot-Network-Calibration-Module",
     "initialCondition": "Bridge configured to defaults",
@@ -11,5 +11,6 @@
     "mandatory": 1,
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
+    "internalBridge": 1,
     "allSupportedValues": [-12, -8, -4, 0, 2, 3]
 }

brg_certificate/tests/calibration/output_power_test/output_power_test.py

@@ -8,7 +8,7 @@ import brg_certificate.cert_config as cert_config
 def run(test):
 
     fields = [BRG_OUTPUT_POWER]
-    calib_module = eval_pkt(f'ModuleCalibrationV{test.active_brg.api_version}')
+    calib_module = test.active_brg.calibration
 
     test = cert_common.test_prolog(test)
     if test.rc == TEST_FAILED:

brg_certificate/tests/calibration/pattern_test/pattern_test.json

@@ -1,6 +1,6 @@
 {
-    "name": "pattern_test",
-    "module": "calibration",
+    "name": "Pattern",
+    "module": "Calibration",
     "purpose": "Test configuration for all supported calibration pattern values",
     "documentation": "https://community.wiliot.com/customers/s/article/Wiliot-Network-Calibration-Module",
     "initialCondition": "Bridge configured to defaults",