netutils.rb in netutils-0.1.2

- old
+ new

@@ -1,10 +1,9 @@
-require "netutils/version"
 require 'mail'
+require 'netutils/version'
 require 'netutils/switch'
 require 'config/config'
-require 'config/passwd'
 
 module Netutils
 
 #
 $progname = File.basename($0)
@@ -12,10 +11,15 @@
 #
 ACL_MAX_SEQ = 4294967294
 #
 $log = ''
 
+end # XXX: module
+
+#
+# XXX: These are global methods!!!!
+#
 def mail(s, b)
 	m = Mail.new do
 		delivery_method :smtp, address: MAILSERVER
 		from MAILFROM
 		to MAILTO
@@ -64,15 +68,15 @@
 def interface_name_vlan_id(name)
 	return $1 if name =~ /^vlan([0-9]+)$/i
 	nil
 end
 
-def static_neighbor_resolve(name, ifname)
-	key = "#{name}_#{ifname}"
+def static_neighbor_resolve(sw, ifname)
+	key = "#{sw.name}_#{ifname}"
 	n = STATIC_NEIGHBOR[key]
 	return nil if n.nil?
-	Switch.get(n[:name], Switch::Type::ROUTER, nil, nil, nil, n[:ia])
+	Switch.get(n[:name], Switch::Type::ROUTER, nil, nil, nil, n[:ia], sw)
 end
 
 def tunnel_nexthop_resolve(sw, rt)
 	return rt.nh if rt.nh
 	c = CDP.new(nil)
@@ -111,8 +115,6 @@
 			nh = bestrt.nh
 		end
 		sw = Switch.new(nil, Switch::Type::ROUTER, nh)
 		sw.login
 	end
-end
-
 end