change location of topology image

Author: enriquetomasmb

nebula/addons/topologymanager.py

@@ -169,43 +169,25 @@ def draw_graph(self, plot=False, path=None):
             None: The method saves the plot as an image at the specified path.
         """
         g = nx.from_numpy_array(self.topology)
-        # pos = nx.layout.spectral_layout(g)
-        # pos = nx.spring_layout(g, pos=pos, iterations=50)
         pos = nx.spring_layout(g, k=0.15, iterations=20, seed=42)
 
         fig = plt.figure(num="Network topology", dpi=100, figsize=(6, 6), frameon=False)
         ax = fig.add_axes([0, 0, 1, 1])
         ax.set_xlim([-1.3, 1.3])
         ax.set_ylim([-1.3, 1.3])
-        # ax.axis('off')
         labels = {}
         color_map = []
         for k in range(self.n_nodes):
             role = str(self.nodes[k][2])
             color_map.append(self.get_node_color(role))
             labels[k] = f"P{k}\n" + str(self.nodes[k][0]) + ":" + str(self.nodes[k][1])
 
-        # nx.draw_networkx_nodes(g, pos_shadow, node_color='k', alpha=0.5)
         nx.draw_networkx_nodes(g, pos, node_color=color_map, linewidths=2)
         nx.draw_networkx_labels(g, pos, labels, font_size=10, font_weight="bold")
         nx.draw_networkx_edges(g, pos, width=2)
-        # plt.margins(0.0)
 
         self.add_legend([str(node[2]) for node in self.nodes])
-
-        # plt.scatter([], [], c="green", label='Central Server')
-        # plt.scatter([], [], c="orange", label='Aggregator')
-        # plt.scatter([], [], c="#6182bd", label='Trainer')
-        # plt.scatter([], [], c="purple", label='Proxy')
-        # plt.scatter([], [], c="red", label='Idle')
-        # import sys
-        # if path is None:
-        #    if not os.path.exists(f"{sys.path[0]}/logs/{self.scenario_name}"):
-        #        os.makedirs(f"{sys.path[0]}/logs/{self.scenario_name}")
-        #    plt.savefig(f"{sys.path[0]}/logs/{self.scenario_name}/topology.png", dpi=100, bbox_inches="tight", pad_inches=0)
-        # else:
         plt.savefig(f"{path}", dpi=100, bbox_inches="tight", pad_inches=0)
-        # plt.gcf().canvas.draw()
         plt.close()
 
     def generate_topology(self):

nebula/frontend/app.py

@@ -733,12 +733,11 @@ def update_topology(scenario_name, nodes_list, nodes_config):
     matrix = np.zeros((len(nodes), len(nodes)))
     for node in nodes_list:
         for neighbour in node[5].split(" "):
-            if neighbour != "":
-                if neighbour in nodes:
-                    matrix[
-                        nodes.index(node[2] + ":" + str(node[3])),
-                        nodes.index(neighbour),
-                    ] = 1
+            if neighbour != "" and neighbour in nodes:
+                matrix[
+                    nodes.index(node[2] + ":" + str(node[3])),
+                    nodes.index(neighbour),
+                ] = 1
     from nebula.addons.topologymanager import TopologyManager
 
     tm = TopologyManager(n_nodes=len(nodes_list), topology=matrix, scenario_name=scenario_name)
@@ -916,7 +915,7 @@ async def nebula_monitor_log_error(scenario_name: str, id: str):
 
 @app.get("/platform/dashboard/{scenario_name}/topology/image/")
 async def nebula_monitor_image(scenario_name: str):
-    topology_image = FileUtils.check_path(settings.log_dir, os.path.join(scenario_name, "topology.png"))
+    topology_image = FileUtils.check_path(settings.config_dir, os.path.join(scenario_name, "topology.png"))
     if os.path.exists(topology_image):
         return FileResponse(topology_image, media_type="image/png")
     else:

nebula/scenarios.py

@@ -524,7 +524,7 @@ def load_configurations_and_start_nodes(self, additional_participants=None, sche
 
         # Add role to the topology (visualization purposes)
         self.topologymanager.update_nodes(config_participants)
-        self.topologymanager.draw_graph(path=f"{self.log_dir}/{self.scenario_name}/topology.png", plot=False)
+        self.topologymanager.draw_graph(path=f"{self.config_dir}/topology.png", plot=False)
 
         # Include additional participants (if any) as copies of the last participant
         additional_participants_files = []