diff --git a/renderer.py b/renderer.py index b581142..e29f987 100644 --- a/renderer.py +++ b/renderer.py @@ -251,6 +251,10 @@ def thread_machine_content(machine, machine_content, idx, all_routes): # Test if the machine is an exit node: exit_route_found = False exit_route_enabled = False + # If the device has enabled Failover routes (High Availability routes) + ha_routes = False + ha_color = "" + # If the length of "routes" is NULL/0, there are no routes, enabled or disabled: if len(pulled_routes["routes"]) > 0: advertised_routes = False @@ -306,6 +310,7 @@ def thread_machine_content(machine, machine_content, idx, all_routes): if str(route_info["prefix"]) == str(route["prefix"]) and (route["prefix"] != "0.0.0.0/0" and route["prefix"] != "::/0"): if route_info["id"] != route["id"]: app.logger.info("HA pair found: %s", str(route["prefix"])) + ha_routes = True failover_pair_prefixes = str(route["prefix"]) if route["prefix"] != "0.0.0.0/0" and route["prefix"] != "::/0" and route["prefix"] in failover_pair_prefixes: route_enabled = "red" @@ -313,6 +318,7 @@ def thread_machine_content(machine, machine_content, idx, all_routes): if route["enabled"]: color_index = failover_pair_prefixes.index(str(route["prefix"])) route_enabled = helper.get_color(color_index, "failover") + ha_color = helper.get_color(color_index, "failover") route_tooltip = 'disable' routes = routes+"""

fiber_manual_record" user_badge = ""+machine["user"]["name"]+"" exit_node_badge = "" if not exit_route_enabled else "Exit Node" - expiration_badge = "" if not expiring_soon else "Expiring!" + ha_route_badge = "" if not ha_routes else "HA" + expiration_badge = "" if not expiring_soon else "Expiring!" machine_content[idx] = (str(render_template( 'machines_card.html', @@ -442,6 +449,7 @@ def thread_machine_content(machine, machine_content, idx, all_routes): machine_ips = Markup(machine_ips), advertised_routes = Markup(routes), exit_node_badge = Markup(exit_node_badge), + ha_route_badge = Markup(ha_route_badge), status_badge = Markup(status_badge), user_badge = Markup(user_badge), last_update_time = str(last_update_time), diff --git a/templates/machines_card.html b/templates/machines_card.html index 9bd0c27..fb43e77 100644 --- a/templates/machines_card.html +++ b/templates/machines_card.html @@ -16,7 +16,7 @@ {{ user_badge }} {{ exit_node_badge }} {{ expiration_badge }} - {{ failover_badge }} + {{ ha_route_badge }}