Fixed #1018 -- resources now have their namevars added as

aliases in the resource catalog, just like they were added
in the resource classes.

3 files changed, 25 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 3d08f305a..1fc69c0a7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+    Fixed #1018 -- resources now have their namevars added as
+    aliases in the resource catalog, just like they were added
+    in the resource classes.
+
     Fixed #1037 -- remote unreadable files no longer have the
     permission denied exceptions caught, thus forbidding them
     from being replaced with 'nil'.
diff --git a/lib/puppet/node/catalog.rb b/lib/puppet/node/catalog.rb
index b74947107..ee4cedd4b 100644
--- a/lib/puppet/node/catalog.rb
+++ b/lib/puppet/node/catalog.rb
@@ -68,7 +68,11 @@ class Puppet::Node::Catalog < Puppet::PGraph
 
             @resource_table[ref] = resource
 
+            # If the name and title differ, set up an alias
+            self.alias(resource, resource.name) if resource.respond_to?(:name) and resource.respond_to?(:title) and resource.name != resource.title
+
             resource.catalog = self if resource.respond_to?(:catalog=) and ! is_relationship_graph
+
             add_vertex(resource)
         end
     end
@@ -78,7 +82,10 @@ class Puppet::Node::Catalog < Puppet::PGraph
         resource.ref =~ /^(.+)\[/
 
         newref = "%s[%s]" % [$1 || resource.class.name, name]
-        raise(ArgumentError, "Cannot alias %s to %s; resource %s already exists" % [resource.ref, name, newref]) if @resource_table[newref]
+        if existing = @resource_table[newref]
+            return if existing == resource
+            raise(ArgumentError, "Cannot alias %s to %s; resource %s already exists" % [resource.ref, name, newref])
+        end
         @resource_table[newref] = resource
         @aliases[resource.ref] << newref
     end
diff --git a/spec/unit/node/catalog.rb b/spec/unit/node/catalog.rb
index aa49909e2..be4edb65d 100755
--- a/spec/unit/node/catalog.rb
+++ b/spec/unit/node/catalog.rb
@@ -455,6 +455,11 @@ describe Puppet::Node::Catalog, " when functioning as a resource container" do
         proc { @catalog.alias @two, "one" }.should raise_error(ArgumentError)
     end
 
+    it "should not fail when a resource has duplicate aliases created" do
+        @catalog.add_resource @one
+        proc { @catalog.alias @one, "one" }.should_not raise_error
+    end
+
     it "should remove resource aliases when the target resource is removed" do
         @catalog.add_resource @one
         @catalog.alias(@one, "other")
@@ -463,6 +468,14 @@ describe Puppet::Node::Catalog, " when functioning as a resource container" do
         @catalog.resource("me", "other").should be_nil
     end
 
+    it "should add an alias for the namevar when the title and name differ" do
+        @one.stubs(:name).returns "other"
+        resource = Puppet::Type.type(:file).create :path => "/something", :title => "other", :content => "blah"
+        @catalog.add_resource(resource)
+        @catalog.resource(:file, "other").should equal(resource)
+        @catalog.resource(:file, "/something").should equal(resource)
+    end
+
     after do
         Puppet::Type.allclear
     end