Changeset 25

Timestamp:

Feb 4, 2008, 2:56:12 PM (17 years ago)

Author:

g7moreau

Message:

• Add the switch model on the dot graph. I need to have the switch database data in the exportsw command. So I save this database at the end of the updatesw command. One day, I have to cleanup what I save...

File:

• trunk/klask (modified) (4 diffs)

trunk/klask

@@ -25 +25 @@
 
 my %switch_level = ();
+my %SWITCH_DB = ();
 LEVEL_OF_EACH_SWITCH:
 for my $sw (@SWITCH){
    $switch_level{$sw->{hostname}} = $sw->{level} || $DEFAULT{switch_level}  || 2;
+   $SWITCH_DB{$sw->{hostname}} = $sw;
    }
 @SWITCH = sort { $switch_level{$b->{hostname}} <=> $switch_level{$a->{hostname}} } @{$KLASK_CFG->{switch}};  
@@ -960 +962 @@
       connected_on_port => \%db_switch_connected_on_port,
       link_with         => \%db_switch_link_with,
+      switch_db         => \%SWITCH_DB,
       };
       
@@ -1027 +1030 @@
    my %db_switch_connected_on_port = %{$switch_connection->{connected_on_port}};
    my %db_switch_link_with         = %{$switch_connection->{link_with}};
-      
+   my %db_switch_global            = %{$switch_connection->{switch_db}};
+
    my %db_building= ();
    for my $sw (@SWITCH) {
@@ -1060 +1064 @@
             print "\"$sw:$db_switch_output_port{$sw}\" [label = $db_switch_output_port{$sw}, color = black, fillcolor = lightblue,  peripheries = 2, style = filled];\n";
 
-            print "\"$sw\" [label = \"$sw\", color = black, fillcolor = palegreen, shape = rect, style = filled];\n";
+            my $swname  = $sw;
+               $swname .= '\n-\n'."$db_switch_global{$sw}->{model}" if exists $db_switch_global{$sw} and exists $db_switch_global{$sw}->{model};
+            print "\"$sw\" [label = \"$swname\", color = black, fillcolor = palegreen, shape = rect, style = filled];\n";
             print "\"location$b-$l\" -> \"$sw\" [len = 2, color = firebrick, arrowtail = dot]\n";
             print "\"$sw\" -> \"$sw:$db_switch_output_port{$sw}\" [len=2, style=bold, arrowhead = normal, arrowtail = invdot]\n";