From: marko <marko>
Date: Thu, 23 Oct 2008 14:46:42 +0000 (+0000)
Subject: Unbreak node name assignment on node creation - a bug which was
X-Git-Url: https://git.entuzijast.net/?a=commitdiff_plain;h=1ba0f7b61a22c763cf18b2f1ffe79979dc19852a;p=imunes.git

Unbreak node name assignment on node creation - a bug which was
introduced by the (hasty) last commit.

Bug found by:	Mirta Medanic
Submitted by:
Reviewed by:
Approved by:
Obtained from:
---

diff --git a/nodecfg.tcl b/nodecfg.tcl
index 64e10d4..973eaac 100755
--- a/nodecfg.tcl
+++ b/nodecfg.tcl
@@ -26,7 +26,7 @@
 # and Technology through the research contract #IP-2003-143.
 #
 
-# $Id: nodecfg.tcl,v 1.24 2008/10/23 14:19:14 marko Exp $
+# $Id: nodecfg.tcl,v 1.25 2008/10/23 14:46:42 marko Exp $
 
 
 #****h* imunes/nodecfg.tcl
@@ -1580,20 +1580,7 @@ proc newNode { type } {
     upvar 0 ::cf::[set ::curcfg]::$node $node
     set $node {}
     lappend $node "type $type"
-    if { $type == "router" } {
-	if { $router_model != $def_router_model } {
-	    lappend $node "model $router_model"
-	} else {
-	    lappend $node "model $def_router_model"
-	}
-	set nconfig [list \
-		"hostname $node" \
-		! ]
-	setNodeProtocolRip $node $ripEnable
-	setNodeProtocolRipng $node $ripngEnable
-	setNodeProtocolOspfv2 $node $ospfEnable 
-	setNodeProtocolOspfv3 $node $ospf6Enable 
-    } elseif {$type == "rj45"} {
+    if {$type == "rj45"} {
 	set nconfig [list \
 		"hostname UNASSIGNED" \
 		! ]
@@ -1601,9 +1588,22 @@ proc newNode { type } {
 	set nconfig [list \
 		"hostname $node" \
 		! ]
+	if { $type == "router" } {
+	    if { $router_model != $def_router_model } {
+		lappend $node "model $router_model"
+	    } else {
+		lappend $node "model $def_router_model"
+	    }
+	}
     }
     lappend $node "network-config [list $nconfig]"
     lappend node_list $node
+    if { $type == "router" } {
+	setNodeProtocolRip $node $ripEnable
+	setNodeProtocolRipng $node $ripngEnable
+	setNodeProtocolOspfv2 $node $ospfEnable 
+	setNodeProtocolOspfv3 $node $ospf6Enable 
+    }
     return $node
 }