Add files via upload

Author: yuhsukeogawa

network_sketcher.py

@@ -42,7 +42,7 @@ def __init__(self):
         self.click_value_3rd = ''
         self.click_value_VPN = ''
         self.root = TkinterDnD.Tk()
-        self.root.title("Network Sketcher  ver 2.4.3")
+        self.root.title("Network Sketcher  ver 2.5.0")
         self.root.geometry("510x200+100+100")
 
         # Notebook
@@ -98,9 +98,12 @@ def __init__(self):
         Help_1_button_1 = tk.Button(Help_1, text="Japanese", font=("", 14), command=lambda: self.click_action_main1_1('self.help_1_button_1'))
         Help_1_button_1.grid(row=1, column=2, sticky='W', padx=20, pady=2 , ipadx=5 ,ipady=0)
 
-        Help_1_1 = tk.Label(tab_x2, font=("", 10), text="Copyright 2023 Cisco Systems, Inc. and its affiliates  \n  SPDX-License-Identifier: Apache-2.0", background='#FFFFFF')
+        Help_1_1 = tk.Label(tab_x2, font=("", 10), text="Author: Yusuke Ogawa - Security Architect, Cisco | CCIE#17583", background='#FFFFFF')
         Help_1_1.grid(column=0, row=3)
 
+        Help_1_1 = tk.Label(tab_x2, font=("", 10), text="Copyright 2023 Cisco Systems, Inc. and its affiliates  \n  SPDX-License-Identifier: Apache-2.0", background='#FFFFFF')
+        Help_1_1.grid(column=0, row=4, pady=2)
+
         # main loop
         self.root.mainloop()
 
@@ -1013,7 +1016,8 @@ def click_action_sub3_1(self, click_value,push_array):
                 #print(flow_list_array)
 
                 #caluculate routing path
-                # TBD
+                flow_list_array = ns_extensions.flow.add_routing_path_to_flow(self,full_filepath_master,flow_list_array)
+                #print(flow_list_array)
 
                 #add last end mark
                 last_number = flow_list_array[-1][0]

network_sketcher_cli.py

@@ -341,6 +341,7 @@ def get_next_arg(argv_array, target):
         return argv_array[index + 1]
     except (ValueError, IndexError):
         return None
+
 def get_next_next_arg(argv_array, target):
     try:
         index = argv_array.index(target)

ns_ddx_figure.py

@@ -2827,9 +2827,9 @@ def add_shape(self,shape_type,shape_left, shape_top, shape_width, shape_hight,sh
 
         elif shape_type == 'L3_SEGMENT_VPN':
             #fill paramter
-            shape_fill.fore_color.rgb = RGBColor(251, 243, 243)
+            shape_fill.fore_color.rgb = RGBColor(248, 243, 251)
             # line paramter
-            shape_line.color.rgb = RGBColor(192, 0, 0)
+            shape_line.color.rgb = RGBColor(112, 48, 160)
             shape_line.width = Pt(0.75)
             self.shape.adjustments[0] = float(0.30045)  # curve of ROUNDED_RECTANGLE 0.0~1.0
             # text parameter
@@ -3020,7 +3020,7 @@ def add_line(self,line_type,inche_from_connect_x,inche_from_connect_y,inche_to_c
              """))
 
         if line_type == 'L3_SEGMENT-VPN':
-            shape_line.color.rgb = RGBColor(192, 0, 0)
+            shape_line.color.rgb = RGBColor(112, 48, 160)
             line_elem = self.shape.line._get_or_add_ln()
             shape_line.width = Pt(0.7)
             line_elem.append(parse_xml("""
@@ -3034,7 +3034,7 @@ def add_line(self,line_type,inche_from_connect_x,inche_from_connect_y,inche_to_c
         if line_type == 'VPN':
             self.shape.shadow.inherit = True
             shape_line.color.brightness = 0.3
-            shape_line.color.rgb = RGBColor(255, 0, 0)
+            shape_line.color.rgb = RGBColor(112, 48, 160)
             shape_line.width = Pt(4.0)
             line_elem = self.shape.line._get_or_add_ln()
             line_elem.append(parse_xml("""
@@ -3047,18 +3047,18 @@ def add_line(self,line_type,inche_from_connect_x,inche_from_connect_y,inche_to_c
         if line_type == 'VPN_curve':
             self.shape.shadow.inherit = True
             shape_line.color.brightness = 0.3
-            shape_line.color.rgb = RGBColor(255, 0, 0)
+            shape_line.color.rgb = RGBColor(112, 48, 160)
             shape_line.width = Pt(4.0)
             #shape_line.dash_style = MSO_LINE.SQUARE_DOT
             line_elem = self.shape.line._get_or_add_ln()
             line_elem.append(parse_xml("""
                     <a:headEnd type="diamond" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"/>
              """))
 
-        if line_type == 'FLOW0':
+        if line_type == 'FLOW0': #direct arrow
             self.shape.shadow.inherit = True
             shape_line.color.brightness = 0.3
-            shape_line.color.rgb = RGBColor(0, 112, 192)
+            shape_line.color.rgb = RGBColor(255, 0, 0)
             shape_line.width = Pt(4.0)
             line_elem = self.shape.line._get_or_add_ln()
             line_elem.append(parse_xml("""
@@ -3068,44 +3068,33 @@ def add_line(self,line_type,inche_from_connect_x,inche_from_connect_y,inche_to_c
                     <a:tailEnd type="arrow" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"/>
              """))
 
-        if line_type == 'FLOW1':
+        if line_type == 'FLOW1': #start arrow
             self.shape.shadow.inherit = True
             shape_line.color.brightness = 0.3
-            shape_line.color.rgb = RGBColor(0, 112, 192)
+            shape_line.color.rgb = RGBColor(255, 0, 0)
             shape_line.width = Pt(4.0)
             line_elem = self.shape.line._get_or_add_ln()
             line_elem.append(parse_xml("""
                     <a:headEnd type="oval" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"/>
              """))
-            '''line_elem.append(parse_xml("""
-                    <a:tailEnd type="arrow" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"/>
-             """))'''
 
-        if line_type == 'FLOW2':
+        if line_type == 'FLOW2': #end arrow
             self.shape.shadow.inherit = True
             shape_line.color.brightness = 0.3
-            shape_line.color.rgb = RGBColor(0, 112, 192)
+            shape_line.color.rgb = RGBColor(255, 0, 0)
             shape_line.width = Pt(4.0)
             line_elem = self.shape.line._get_or_add_ln()
-            '''line_elem.append(parse_xml("""
-                    <a:headEnd type="oval" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"/>
-             """))'''
             line_elem.append(parse_xml("""
                     <a:tailEnd type="arrow" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"/>
              """))
 
-        if line_type == 'FLOW3':
+        if line_type == 'FLOW3': #connect arrow
             self.shape.shadow.inherit = True
             shape_line.color.brightness = 0.3
-            shape_line.color.rgb = RGBColor(0, 112, 192)
+            shape_line.color.rgb = RGBColor(255, 0, 0)
             shape_line.width = Pt(4.0)
             line_elem = self.shape.line._get_or_add_ln()
-            '''line_elem.append(parse_xml("""
-                    <a:headEnd type="oval" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"/>
-             """))
-            line_elem.append(parse_xml("""
-                    <a:tailEnd type="arrow" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"/>
-             """))'''
+
 
 
     def l2_device_materials(self,action_type,input_device_name,write_left_top_array,wp_list_array):

ns_extensions.py

@@ -17,18 +17,67 @@
 '''
 from idlelib.debugobj_r import remote_object_tree_item
 
-import ns_def, ns_egt_maker, ns_ddx_figure
+import ns_def, ns_egt_maker, ns_ddx_figure, network_sketcher_cli
 from collections import Counter
 import tkinter as tk ,tkinter.ttk , openpyxl
 import ipaddress, sys, os, re, shutil
 import numpy as np
+import networkx as nx
 
 class  flow():
+    def add_routing_path_to_flow(self,full_filepath_master,flow_list_array):
+        print('--- Routing path calculation ---')
+        argv_array = ['show', 'l3_broadcast_domain']
+        l3_broadcast_array = network_sketcher_cli.ns_cli_run.cli_show(self, full_filepath_master, argv_array)
+        #print(l3_broadcast_array)
+
+        G = nx.Graph()
+        # Add nodes and edges to the graph
+        for domain_info in l3_broadcast_array:
+            broadcast_domain, device_interfaces = domain_info
+            devices = [dev[0] for dev in device_interfaces]
+
+            # Connect all devices in the broadcast domain (full graph)
+            for i in range(len(devices)):
+                for j in range(i + 1, len(devices)):
+                    G.add_edge(devices[i], devices[j])
+
+        for row in flow_list_array[2:]:
+            data = row[1]
+            source = data[1]
+            target = data[2]
+
+            path = flow.get_shortest_path(G, source, target)
+            #print(path)
+            if 'is not in G' in path:
+                continue
+
+            if len(path) >= 2:
+                path = path[1:-1]
+            path2 = ', '.join([f"'{p}'" for p in path])
+            if path2 == '':
+                path2 = ' '
+
+            data[7] = path2
+
+        #print(flow_list_array)
+        return (flow_list_array)
+
+    def get_shortest_path(G,source, target):
+        try:
+            path = nx.shortest_path(G, source=source, target=target)
+            #print(source,target,path, G)
+            return path
+        except nx.NetworkXNoPath:
+            return f"The Path from {source} to {target} could not be found."
+        except nx.NodeNotFound as e:
+            return str(e)
+
     def append_flows_to_diagram(self,variable3_7_y_1,variable3_7_y_2,variable3_7_y_3): #add at ver 2.4.3
         print('--- append_flows_to_diagram ---')
-        print(variable3_7_y_1.get(), variable3_7_y_2.get(), variable3_7_y_3.get())
-        print(self.pptx_full_filepath)
-        print(self.full_filepath)
+        #print(variable3_7_y_1.get(), variable3_7_y_2.get(), variable3_7_y_3.get())
+        #print(self.pptx_full_filepath)
+        #print(self.full_filepath)
 
         ws_flow_name = 'Flow_Data'
         excel_maseter_file = self.full_filepath
@@ -56,7 +105,7 @@ def append_flows_to_diagram(self,variable3_7_y_1,variable3_7_y_2,variable3_7_y_3
                     (element[4] == variable3_7_y_3.get() or variable3_7_y_3.get() == 'Any'):
                 filtered_target_flow.append(element)
 
-        print(filtered_target_flow)
+        #print(filtered_target_flow)
 
         '''read the pptx file and shapes data'''
         self.shape_name_grid_array = []
@@ -75,7 +124,7 @@ def append_flows_to_diagram(self,variable3_7_y_1,variable3_7_y_2,variable3_7_y_3
                     except IndexError:
                         pass
 
-        print(self.shape_name_grid_array)
+        #print(self.shape_name_grid_array)
 
         ''' deside routes and write flows '''
         if os.path.isfile(self.pptx_full_filepath) == True:
@@ -117,7 +166,7 @@ def append_flows_to_diagram(self,variable3_7_y_1,variable3_7_y_2,variable3_7_y_3
                 if source_grid == None or destination_grid == None:
                     continue
 
-                print(source_grid, destination_grid)
+                #print(source_grid, destination_grid)
 
                 line_type = 'FLOW0'
                 inche_from_connect_x = (source_grid[1] + source_grid[3] * 0.25) / 914400
@@ -127,10 +176,10 @@ def append_flows_to_diagram(self,variable3_7_y_1,variable3_7_y_2,variable3_7_y_3
                 ns_ddx_figure.extended.add_line(self,line_type,inche_from_connect_x,inche_from_connect_y,inche_to_connect_x,inche_to_connect_y)
 
             elif len(selected_route_path) >= 3:
-                print(selected_route_path)
+                #print(selected_route_path)
                 for i in range(len(selected_route_path) - 1):
                     pair = [selected_route_path[i], selected_route_path[i + 1]]
-                    print(pair,i,len(selected_route_path) - 2 )
+                    #print(pair,i,len(selected_route_path) - 2 )
 
                     # get source grid value
                     source_grid = next(
@@ -173,6 +222,9 @@ def append_flows_to_diagram(self,variable3_7_y_1,variable3_7_y_2,variable3_7_y_3
         modified_filepath = os.path.join(folder, f"Added_flows_{filename}")
         self.active_ppt.save(modified_filepath)
 
+        #file open
+        ns_def.messagebox_file_open(modified_filepath)
+
     def get_flow_item_list(self): # add at ver 2.4.3
         #print('--- get_flow_item_list ---')
         excel_maseter_file = self.inFileTxt_L2_3_1.get()
@@ -260,8 +312,9 @@ def export_flow_file(self,dummy):
                 for i in range(1, 8):
                     if tmp_master_flow_array[1][i] == '':
                         tmp_master_flow_array[1][i] = '<EMPTY>'
+                print(tmp_master_flow_array[1][7])
 
-                flow_list_array.append([current_row_num, ['',str(current_row_num - 2), '>>' + str(tmp_master_flow_array[1][1]), '>>' + str(tmp_master_flow_array[1][2]), '>>' + str(tmp_master_flow_array[1][3]), '>>' + str(tmp_master_flow_array[1][4]), '>>' + str(tmp_master_flow_array[1][5]), '>>' + str(tmp_master_flow_array[1][6]),' ', '<END>']])
+                flow_list_array.append([current_row_num, ['',str(current_row_num - 2), '>>' + str(tmp_master_flow_array[1][1]), '>>' + str(tmp_master_flow_array[1][2]), '>>' + str(tmp_master_flow_array[1][3]), '>>' + str(tmp_master_flow_array[1][4]), '>>' + str(tmp_master_flow_array[1][5]), '>>' + str(tmp_master_flow_array[1][6]),str(tmp_master_flow_array[1][7]), '<END>']])
                 current_row_num += 1
 
         if flag_master_has_flow_sheet == True and all_empty == True: