wiliot-certificate 1.4.0a2__py3-none-any.whl → 1.5.1a1__py3-none-any.whl

brg_certificate/cert_results.py

@@ -3,15 +3,15 @@ import tabulate
 import subprocess
 from reportlab.lib import colors
 from reportlab.lib.pagesizes import letter
-from reportlab.platypus import SimpleDocTemplate, Table, TableStyle, Paragraph, Spacer
-from reportlab.lib.styles import getSampleStyleSheet, ParagraphStyle
+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
 
 # Local imports
 import brg_certificate.cert_utils as cert_utils
 import brg_certificate.cert_prints as cert_prints
-from brg_certificate.cert_defines import BASE_DIR
-from brg_certificate.cert_defines import TEST_FAILED, TEST_SKIPPED, TEST_PASSED, TEST_INIT, UT_RESULT_FILE_HTML, UT_RESULT_FILE_PDF
+from brg_certificate.wlt_types import *
+from brg_certificate.cert_defines import *
 
 
 ##################################
@@ -21,18 +21,22 @@ result_map = {TEST_FAILED: cert_prints.color("RED", "FAIL"), TEST_SKIPPED: cert_
               TEST_PASSED: cert_prints.color("GREEN", "PASS"), TEST_INIT: cert_prints.color("CYAN", "INIT")}
 pass_or_fail = lambda obj : result_map[obj.rc]
 class TestResult:
-    def __init__(self, name="", devices_to_print="", test_table=None, result=None, duration=0):
+    def __init__(self, name="", devices_to_print="", test_table=None, result=None, duration=0, purpose="", kb_link="", compliance="", test_skipped=False):
         self.name = name
         self.devices = devices_to_print
         self.result = result
         self.test_table = test_table
         self.duration = duration
+        self.purpose = purpose
+        self.kb_link = kb_link
+        self.compliance = compliance
+        self.test_skipped = test_skipped
     
     def __repr__(self):
         return self.name
 
 def generate_tests_table(tests=[], html=False):
-    headers = ["Module", "Test Name", "Device", "Result & Reason Breakdown", "Result", "Run Time"]
+    headers = ["Module", "Test Name", "Device", "Result Breakdown", "Result", "Run Time"]
     inner_format = "unsafehtml" if html else "simple"
     _pass_or_fail = pass_or_fail_html if html else pass_or_fail
     tests_results = []
@@ -40,7 +44,7 @@ def generate_tests_table(tests=[], html=False):
         brgs_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 = [[phase.name, _pass_or_fail(phase), phase.reason] for phase in test.phases]
-        result_breakdown_table = tabulate.tabulate(inner_table, headers=["Phase", "Result", "Reason"], tablefmt=inner_format)
+        result_breakdown_table = tabulate.tabulate(inner_table, headers=["Phase", "Result", "Notes"], tablefmt=inner_format)
         tests_results.append([cert_utils.module2name(test.test_module),
                               test.module_name if (not test.internal_brg or "gw" in test.module_name) else f"{test.module_name} (internal brg)",
                               brgs_to_print,
@@ -66,15 +70,15 @@ def get_update_status_from_log_file(log_file="update_log.txt"):
                 elif "ota_test failed!" in l:
                     update_status = "BRG OTA failed!"
                     break
-                elif "Wiliot UT PASSED!" in l:
+                elif "PASSED!" in l:
                     update_status = "GW and BRG versions were updated to latest successfully!"
                     break
-                elif "Update skipped!" in l:
+                elif "SKIPPED!" in l:
                     update_status = "GW and BRG versions update skipped!"
                     break
     return update_status
 
-def generate_results_files(html=True, pdf=True, failures=0, skipped=0, duration=0, brg_version='', tests=[], error=None, pipeline=False):
+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):
     # Generate HTML file
     if html:
         f = open(os.path.join(BASE_DIR, UT_RESULT_FILE_HTML), "w", encoding="utf-8")
@@ -85,30 +89,36 @@ def generate_results_files(html=True, pdf=True, failures=0, skipped=0, duration=
                                 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 UT Failed!</h1><br>")
+            f.write("<br><h1 style='color:#ab0000'>Wiliot Certificate Error!</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]))
-            if brg_version:
-                f.write("Bridge version: {} <br><br>".format(brg_version))
+            if brg:
+                f.write("Bridge version: {} <br><br>".format(brg.version))
         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 UT Passed!</h1>")
+                f.write("<br><h1 style='color:#00AB83'>Wiliot Certificate Passed!</h1>")
             else:
-                f.write("<br><h1 style='color:#ab0000'>Wiliot UT Failed!</h1>")
+                f.write("<br><h1 style='color:#ab0000'>Wiliot Certificate Failed!</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]))
-            if brg_version:
-                f.write("Bridge version: {} <br><br>".format(brg_version))
-        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>")
+            f.write("Certificate version: {} <br><br>".format(CERT_VERSION))
+            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))
+            if brg:
+                f.write("Bridge version: {} <br><br>".format(brg.version))
+            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("<img src='https://www.wiliot.com/src/img/svg/logo.svg' width='100' height='40' alt='Wiliot logo'>")
@@ -118,59 +128,94 @@ def generate_results_files(html=True, pdf=True, failures=0, skipped=0, duration=
     # Generate PDF file
     if pdf:
         doc = SimpleDocTemplate(os.path.join(BASE_DIR, UT_RESULT_FILE_PDF), pagesize=letter)
-        styles = getSampleStyleSheet()
-        elements = []
-        update_status = get_update_status_from_log_file()
+        doc.title = "Wiliot Certificate Results"
+        elements, hdr_page = [], []
+
+        # Add Wiliot Logo
+        img = Image(os.path.join(BASE_DIR, "../common", "wlt_logo.png"), width=100, height=40)  # Adjust size as needed
+        hdr_page.append(img)
+        hdr_page.append(Spacer(1, 20))
 
         # Title and Summary
         red_header = STYLES_PDF.get("RED_HEADER", ParagraphStyle("Default"))
         green_header = STYLES_PDF.get("GREEN_HEADER", ParagraphStyle("Default"))
         module_header = STYLES_PDF.get("MODULE_HEADER", ParagraphStyle("Default"))
-        test_header = STYLES_PDF.get("TEST_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"))
+        centered_text_style = STYLES_PDF.get("BLACK", ParagraphStyle("Default"))
         if error:
-            title = Paragraph("<b>Wiliot UT Failed!</b>", red_header)
-            elements.append(title)
-            elements.append(Paragraph(f"Error: {error}", styles['BodyText']))
+            title = Paragraph("<b>Wiliot Certificate Error!</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 UT Passed!</b>", green_header) if not failures else Paragraph("<b>Wiliot UT Failed!</b>", red_header)
-            elements.append(title)
-        elements.append(Spacer(1, 50))
+            title = Paragraph("<b>Wiliot Certificate Passed!</b>", green_header) if not failures else Paragraph("<b>Wiliot Certificate Failed!</b>", red_header)
+            hdr_page.append(title)
+        hdr_page.append(Spacer(1, 20))
+        hdr_page.append(Paragraph(f"<b>Summary</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(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(Spacer(1, 20))
 
-        elements.append(Paragraph(f"Tests duration: {str(duration).split('.')[0]}", styles['BodyText']))
-        if brg_version:
-            elements.append(Paragraph(f"Bridge version: {brg_version}", styles['BodyText']))
-        elements.append(Paragraph(f"Update status: {update_status}", styles['BodyText']))
-        elements.append(Spacer(1, 20))
-
-        # Summary Table
-        summary_data = [
+        # Count Table
+        count_data = [
             ["PASSED", "SKIPPED", "FAILED", "TOTAL"],
             [len(tests)-(failures+skipped), skipped, failures, len(tests)]
         ]
-        summary_table = Table(summary_data)
-        summary_table.setStyle(INNER_TABLE_STYLE)
-        elements.append(summary_table)
-        elements.append(Spacer(1, 20))
+        count_table = Table(count_data)
+        count_table.setStyle(INNER_TABLE_STYLE)
+        hdr_page.append(count_table)
+        hdr_page.append(Spacer(1, 20))
 
         # Test Results
         results_per_module = generate_results_per_module_for_pdf(tests=tests)
+        summary_data = []
         for module, test_results in results_per_module.items():
-            elements.append(Paragraph(f"<b>{module} Module</b>", module_header))
-            elements.append(Spacer(1, 20))
+            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(Spacer(1, 20))
             for test_result in test_results:
-                elements.append(Paragraph(f"<b>{test_result.name}</b>", test_header))
-                elements.append(Spacer(1, 10))
-
-                elements.append(test_result.result)
-                elements.append(Spacer(1, 10))
-
-                elements.append(Paragraph(f"Tested Devices: {test_result.devices}", styles['BodyText']))
-                elements.append(Paragraph(f"Duration: {test_result.duration}", styles['BodyText']))
-                elements.append(Spacer(1, 10))
-
-                elements.append(test_result.test_table)
-                elements.append(Spacer(1, 20))
-            elements.append(Spacer(1, 50))
+                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
+                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(Spacer(1, 10))
+                test_objects.append(test_result.result)
+                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, 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)
+        elements = hdr_page + [summary_table, PageBreak()] + elements
 
         doc.build(elements)
 
@@ -199,46 +244,46 @@ HTML_START = """
     <head>
         <meta charset='utf-8'>
         <meta http-equiv='X-UA-Compatible' content='IE=edge'>
-        <title>UT RESULTS</title>
+        <title>Wiliot Certificate Results</title>
         <meta name='viewport' content='width=device-width, initial-scale=1'>
         <style>
-        html, body {
+        html, body {{
                 height: 100%;
-            }
+            }}
 
-            html {
+            html {{
                 display: table;
                 margin: auto;
-            }
+            }}
 
-            body {
+            body {{
                 display: table-cell;
                 vertical-align: middle;
-            }
-        table {
+            }}
+        table {{
             border-collapse: collapse;
             font-family: Tahoma, Geneva, sans-serif;
-        }
-        table td {
+        }}
+        table td {{
             padding: 15px;
-        }
-        table thead td {
+        }}
+        table thead td {{
             background-color: #54585d;
             color: #ffffff;
             font-weight: bold;
             font-size: 13px;
             border: 1px solid #54585d;
-        }
-        table tbody td {
+        }}
+        table tbody td {{
             color: #636363;
             border: 1px solid #dddfe1;
-        }
-        table tbody tr {
+        }}
+        table tbody tr {{
             background-color: #f9fafb;
-        }
-        table tbody tr:nth-child(odd) {
+        }}
+        table tbody tr:nth-child(odd) {{
             background-color: #ffffff;
-        }
+        }}
         </style>
     </head>
     <body>
@@ -254,9 +299,12 @@ HTML_END = """
 STYLES_PDF = {
     "GREEN_HEADER": ParagraphStyle("Green Header", fontName="Helvetica-Bold", fontSize=20, textColor=colors.green, 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.blue, 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),
-    "BLUE": ParagraphStyle("Blue", fontName="Helvetica-Bold", fontSize=9, textColor=colors.blue, splitLongWords=False, 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'),
+    "BLACK_BOLD": ParagraphStyle("Black Bold", fontName="Helvetica-Bold", fontSize=9, textColor=colors.black, splitLongWords=False, alignment=TA_LEFT, 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),
@@ -277,21 +325,23 @@ INNER_TABLE_STYLE = TableStyle([
                 ('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.beige),
+                ('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"))
     results_per_module = {}
     for test in tests:
-        name=test.module_name if (not test.internal_brg or "gw" in test.module_name) else f"{test.module_name} (internal brg)"
         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 = [[phase.name, pass_or_fail_pdf(phase), phase.reason] for phase in test.phases]
-        test_table = Table([["Phase", "Result", "Reason"]] + inner_table)
+        inner_table = [[Paragraph(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_result = TestResult(name=name, devices_to_print=devices_to_print,
-                                 test_table=test_table, result=pass_or_fail_pdf(test), duration=test.duration)
+        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),
+                                 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)
         if module_name not in results_per_module:
                 results_per_module[module_name] = [test_result]

brg_certificate/cert_utils.py

@@ -43,14 +43,14 @@ 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, duration=duration, error=error, pipeline=cert_common.pipeline_running())
+    cert_results.generate_results_files(html=True, pdf=True, start_time=start_time, duration=duration, error=error, pipeline=cert_common.pipeline_running())
     sys.exit(-1)
 
 ##################################
 # Test
 ##################################
 class WltTest:
-    def __init__(self, line, gw, mqttc, brg0=None, brg1=None, exit_on_param_failure=False, gw_lan=False,
+    def __init__(self, line, gw, mqttc, sim_mqttc=None, brg0=None, brg1=None, exit_on_param_failure=False, gw_lan=False,
                  gw_orig_versions={}, server=PROD, latest=False, release_candidate=False, private_setup=False,
                  internal_brg_obj=None, gw_sim='', data='', port='', protobuf=False):
         if line:
@@ -73,7 +73,7 @@ class WltTest:
             self.test_json = {}
             self.internal_brg = False
             self.multi_brg = False
-            self.phases = [Phase(PROLOG), Phase(TEST_BODY), Phase(EPILOG)]
+            self.phases = [Phase(PRE_CONFIG), Phase(TEST_BODY), Phase(RESTORE_CONFIG)]
             self.params = []
 
         self.gw = gw
@@ -83,11 +83,12 @@ class WltTest:
         self.brg0 = brg0
         self.brg1 = brg1
         self.rc = TEST_PASSED
-        self.reason = TEST_SUCCESS
+        self.reason = ""
         self.start_time = None
         self.end_time = None
         self.duration = None
         self.mqttc = mqttc
+        self.sim_mqttc = sim_mqttc
         self.rtsa = ""
         self.exit_on_param_failure = exit_on_param_failure
         self.rand = random.randrange(255)
@@ -105,7 +106,7 @@ class WltTest:
     def create_test_phases_and_params(self, line_params):
         self.params = []
         if len(self.test_json[ALL_SUPPORTED_VALUES]) > 0:
-            self.phases = [Phase(PROLOG)] + [Phase(param) for param in self.test_json[ALL_SUPPORTED_VALUES]] + [Phase(EPILOG)]
+            self.phases = [Phase(PRE_CONFIG)] + [Phase(param) for param in self.test_json[ALL_SUPPORTED_VALUES]] + [Phase(RESTORE_CONFIG)]
             for param_phase in self.phases:
                 param = Param(param_phase.name)
                 if (param.name in line_params or param.value in [eval_param(p) for p in line_params]):
@@ -120,7 +121,7 @@ class WltTest:
             if line_params:
                 error = f"ERROR: For {self.name} params exist in test_list but not in test_json!\nline_params:{line_params}"
                 handle_error(error, datetime.datetime.now())
-            self.phases = [Phase(PROLOG), Phase(TEST_BODY), Phase(EPILOG)]
+            self.phases = [Phase(PRE_CONFIG), Phase(TEST_BODY), Phase(RESTORE_CONFIG)]
 
     # Phase rc
     def set_phase_rc(self, phase_name, rc):
@@ -134,9 +135,7 @@ class WltTest:
     # Phase reason
     def add_phase_reason(self, phase_name, reason):
         phase = self.get_phase_by_name(phase_name)
-        if TEST_SUCCESS in phase.reason:
-            phase.reason = phase.reason.replace(TEST_SUCCESS, "")
-        else:
+        if phase.reason:
             phase.reason += "\n"
         if reason not in phase.reason:
             phase.reason += reason
@@ -158,7 +157,7 @@ class WltTest:
     
     def reset_result(self):
         self.rc = TEST_PASSED
-        self.reason = TEST_SUCCESS
+        self.reason = ""
 
     def get_seq_id(self):
         self.rand = (self.rand + 1) % 256
@@ -166,9 +165,7 @@ class WltTest:
 
     # TODO - remove when test reason is re-designed
     def add_reason(self, reason):
-        if TEST_SUCCESS in self.reason:
-            self.reason = self.reason.replace(TEST_SUCCESS, "")
-        else:
+        if self.reason:
             self.reason += "\n"
         if reason not in self.reason:
             self.reason += reason
@@ -180,7 +177,7 @@ class WltTest:
 # Phases
 ##################################
 class Phase:
-    def __init__(self, input=None, tested=True, rc=TEST_INIT, reason=TEST_SUCCESS):
+    def __init__(self, input=None, tested=True, rc=TEST_INIT, reason=""):
         self.name = str(input)
         self.tested = tested
         self.rc = rc
@@ -257,7 +254,7 @@ def cfg_brg_defaults_ret_after_fail(test):
 def handle_prep_brg_for_latest(test, interface, start_time):
     if test.rc == TEST_FAILED:
         utPrint(f"No ModuleIf pkts found, try again", "BLUE")
-        test.rc = TEST_SUCCESS
+        test.rc = ""
         test, interface = cert_common.get_module_if_pkt(test)
     if test.rc == TEST_FAILED:
         error = f"ERROR: No ModuleIf pkts found for 2 tries, couldn't perform OTA for bridge"
@@ -324,10 +321,10 @@ def get_gw_id(gw):
     else:
         return gw
 
-def ut_prep_gw(args, mqttc, start_time):
+def ut_prep_gw(args, mqttc, start_time, tester_gw=False):
     # Check GW is online and configure to defaults
     utPrint(SEP)
-    gw = args.gw
+    gw = args.brg_cloud_connectivity if args.brg_cloud_connectivity and not tester_gw else args.gw
     test = WltTest("", gw, mqttc, gw_lan=args.lan)
     utPrint(f"Getting GW {gw} Information", "BLUE")
     response = cert_common.get_gw_info(test)

brg_certificate/certificate_bcc_sanity_test_list.txt

@@ -0,0 +1,35 @@
+# 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>
+
+# ------------- edge_mgmt -------------
+edge_mgmt/stat_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 -------------
+energy2400/pattern_test ENERGY_PATTERN_2_4_CHANNEL_37 ENERGY_PATTERN_2_4_CHANNEL_39 ENERGY_PATTERN_2_4_FREQ_2454
+energy2400/output_power_test -12 0 3
+energy2400/duty_cycle_test 1 50 75
+energy2400/signal_indicator_test internal_brg brg0_rxtx_brg1_rxtx
+
+# ------------- energy_sub1g -------------
+energy_sub1g/pattern_test SUB1G_ENERGY_PATTERN_NO_ENERGIZING SUB1G_ENERGY_PATTERN_FCC_HOPPING SUB1G_ENERGY_PATTERN_SINGLE_TONE_917500 SUB1G_ENERGY_PATTERN_NZ_HOPPING
+energy_sub1g/duty_cycle_test 15 20 40 0
+energy_sub1g/signal_indicator_test 60,4
+
+# ------------- datapath -------------
+datapath/rssi_threshold_test -80
+datapath/pattern_test DATAPATH_PATTERN_38_38_39 DATAPATH_PATTERN_EU_PATTERN
+datapath/output_power_test -12 0 3
+datapath/pkt_filter_test PKT_FILTER_DISABLE_FORWARDING PKT_FILTER_TEMP_PKT
+datapath/pkt_filter_gen3_test PKT_FILTER_DISABLE_FORWARDING PKT_FILTER_TEMP_PKT
+datapath/pkt_filter_ble5_test PKT_FILTER_DISABLE_FORWARDING PKT_FILTER_TEMP_PKT
+datapath/rx_channel_test RX_CHANNEL_37 RX_CHANNEL_38 RX_CHANNEL_10_250K RX_CHANNEL_10_500K
+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

brg_certificate/certificate_bcc_test_list.txt

@@ -0,0 +1,45 @@
+# 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
+
+# ------------- edge_mgmt -------------
+edge_mgmt/stat_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 -------------
+energy2400/pattern_test ENERGY_PATTERN_2_4_NO_ENERGIZING ENERGY_PATTERN_2_4_CHANNEL_37 ENERGY_PATTERN_2_4_CHANNEL_38 ENERGY_PATTERN_2_4_CHANNEL_39 ENERGY_PATTERN_2_4_FREQ_2450 ENERGY_PATTERN_2_4_FREQ_2454
+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 
+
+# ------------- 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
+energy_sub1g/duty_cycle_test 15 20 40 0
+energy_sub1g/signal_indicator_test 60,4 100,3
+
+# ------------- datapath -------------
+datapath/rssi_threshold_test -80 -65 -10
+datapath/pattern_test DATAPATH_PATTERN_38_38_39 DATAPATH_PATTERN_EU_PATTERN
+datapath/output_power_test -12 -8 -4 0 2 3
+datapath/pacer_interval_test 5 15 30 60
+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_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/num_of_tags_test 5000
+
+# ------------- 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

brg_certificate/certificate_sanity_test_list.txt

@@ -26,8 +26,9 @@ datapath/pkt_filter_test PKT_FILTER_DISABLE_FORWARDING PKT_FILTER_TEMP_PKT
 datapath/pkt_filter_gen3_test PKT_FILTER_DISABLE_FORWARDING PKT_FILTER_TEMP_PKT
 datapath/pkt_filter_ble5_test PKT_FILTER_DISABLE_FORWARDING PKT_FILTER_TEMP_PKT
 datapath/rx_channel_test RX_CHANNEL_37 RX_CHANNEL_38 RX_CHANNEL_10_250K RX_CHANNEL_10_500K
-datapath/num_of_tags_test 500
+datapath/aging_test low_pacer
 datapath/stress_gen3_test rep1_adaptive_pacer 
+datapath/num_of_tags_test 500
 
 
 # ------------- calibration -------------

brg_certificate/certificate_test_list.txt

@@ -3,6 +3,9 @@
 # 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
+
 # ------------- edge_mgmt -------------
 edge_mgmt/stat_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
@@ -12,6 +15,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 
 
 # ------------- 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
@@ -21,23 +26,24 @@ energy_sub1g/signal_indicator_test 60,4 100,3
 # ------------- datapath -------------
 datapath/rssi_threshold_test -80 -65 -10
 datapath/pattern_test DATAPATH_PATTERN_38_38_39 DATAPATH_PATTERN_EU_PATTERN
-datapath/tx_repetition_test 2 4
+datapath/tx_repetition_test 2 4 
 datapath/output_power_test -12 -8 -4 0 2 3
 datapath/pacer_interval_test 5 15 30 60
 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/num_of_tags_test 2500
 datapath/pacer_interval_tags_count_test 1 10 15 30
 datapath/stress_test rep3 rep2 rep1 rep1_adaptive_pacer pixel_burst
 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
+
 
 # ------------- 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
-

brg_certificate/restore_brg.py

@@ -1,4 +1,6 @@
+import sys
 import os
+sys.path.insert(0, os.path.abspath(".."))
 import argparse
 import brg_certificate.cert_common as cert_common
 from brg_certificate.cert_utils import *