Adding the necessary name/ip fields to the node methods

lib/puppet/network/handler/node.rb

@@ -9,7 +9,7 @@ require 'puppet/util/instance_loader'
 class Puppet::Network::Handler::Node < Puppet::Network::Handler
     # A simplistic class for managing the node information itself.
     class SimpleNode
-        attr_accessor :name, :classes, :parameters, :environment, :source
+        attr_accessor :name, :classes, :parameters, :environment, :source, :ipaddress
 
         def initialize(name, options = {})
             @name = name
@@ -114,7 +114,7 @@ class Puppet::Network::Handler::Node < Puppet::Network::Handler
 
     # Return an entire node configuration.  This uses the 'nodesearch' method
     # defined in the node_source to look for the node.
-    def details(key)
+    def details(key, client = nil, clientip = nil)
         facts = node_facts(key)
         node = nil
         names = node_names(key, facts)
@@ -148,7 +148,7 @@ class Puppet::Network::Handler::Node < Puppet::Network::Handler
     end
 
     # Return a given node's environment.
-    def environment(key)
+    def environment(key, client = nil, clientip = nil)
         if node = details(key)
             node.environment
         else
@@ -169,14 +169,8 @@ class Puppet::Network::Handler::Node < Puppet::Network::Handler
         super
     end
 
-    # Short-hand for creating a new node, so the node sources don't need to
-    # specify the constant.
-    def newnode(options)
-        SimpleNode.new(options)
-    end
-
     # Try to retrieve a given node's parameters.
-    def parameters(key)
+    def parameters(key, client = nil, clientip = nil)
         if node = details(key)
             node.parameters
         else
@@ -194,6 +188,12 @@ class Puppet::Network::Handler::Node < Puppet::Network::Handler
         @fact_handler
     end
 
+    # Short-hand for creating a new node, so the node sources don't need to
+    # specify the constant.
+    def newnode(options)
+        SimpleNode.new(options)
+    end
+
     # Look up the node facts from our fact handler.
     def node_facts(key)
         if facts = fact_handler.get(key)

test/network/handler/node.rb

@@ -141,7 +141,7 @@ class TestNodeInterface < Test::Unit::TestCase
     def test_newnode
         SimpleNode.expects(:new).with("stuff")
         handler = Node.new
-        handler.newnode("stuff")
+        handler.send(:newnode, "stuff")
     end
 
     # Make sure we can build up the correct node names to search for