From 34fb97e29d3045dbdc2fa07d81f4df3e3df586ac Mon Sep 17 00:00:00 2001
From: Adam Spiers <aspiers@suse.com>
Date: Mon, 3 Feb 2014 14:05:09 +0000
Subject: [PATCH] tidy up string handling

---
 libraries/pacemaker/cib_object.rb |  4 ++++
 libraries/pacemaker/resource.rb   |  2 +-
 providers/primitive.rb            | 20 ++++++++++----------
 spec/providers/primitive_spec.rb  |  4 ++--
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/libraries/pacemaker/cib_object.rb b/libraries/pacemaker/cib_object.rb
index c6c2ed4..0df6891 100644
--- a/libraries/pacemaker/cib_object.rb
+++ b/libraries/pacemaker/cib_object.rb
@@ -104,6 +104,10 @@ module Pacemaker
       self.class.type(definition)
     end
 
+    def to_s
+      "%s '%s'" % [self.class.description, name]
+    end
+
     def delete_command
       "crm configure delete '#{name}'"
     end
diff --git a/libraries/pacemaker/resource.rb b/libraries/pacemaker/resource.rb
index 99c8000..68e35a8 100644
--- a/libraries/pacemaker/resource.rb
+++ b/libraries/pacemaker/resource.rb
@@ -6,7 +6,7 @@ module Pacemaker
     include Chef::Mixin::ShellOut
 
     def self.description
-      type = self.to_s.split('::').last
+      type = self.to_s.split('::').last.downcase
       "#{type} resource"
     end
 
diff --git a/providers/primitive.rb b/providers/primitive.rb
index 9f2e15d..d215f6b 100644
--- a/providers/primitive.rb
+++ b/providers/primitive.rb
@@ -29,9 +29,9 @@ action :create do
     create_resource(name)
   else
     if @current_resource.agent != new_resource.agent
-      raise "Existing resource primitive '%s' has agent '%s' " \
+      raise "Existing %s has agent '%s' " \
             "but recipe wanted '%s'" % \
-            [ name, @current_resource.agent, new_resource.agent ]
+            [ @current_cib_object, @current_resource.agent, new_resource.agent ]
     end
 
     maybe_modify_resource(name)
@@ -43,13 +43,13 @@ action :delete do
   next unless @current_resource
   rsc = Pacemaker::Resource::Primitive.new(name)
   if rsc.running?
-    raise "Cannot delete running resource primitive #{name}"
+    raise "Cannot delete running #{@current_cib_object}"
   end
   execute rsc.delete_command do
     action :nothing
   end.run_action(:run)
   new_resource.updated_by_last_action(true)
-  Chef::Log.info "Deleted primitive '#{name}'."
+  Chef::Log.info "Deleted #{@current_cib_object}"
 end
 
 action :start do
@@ -63,7 +63,7 @@ action :start do
     action :nothing
   end.run_action(:run)
   new_resource.updated_by_last_action(true)
-  Chef::Log.info "Successfully started primitive '#{name}'."
+  Chef::Log.info "Successfully started #{@current_cib_object}"
 end
 
 action :stop do
@@ -77,7 +77,7 @@ action :stop do
     action :nothing
   end.run_action(:run)
   new_resource.updated_by_last_action(true)
-  Chef::Log.info "Successfully stopped primitive '#{name}'."
+  Chef::Log.info "Successfully stopped #{@current_cib_object}"
 end
 
 def cib_object_class
@@ -95,7 +95,7 @@ def create_resource(name)
   primitive = Pacemaker::Resource::Primitive.from_chef_resource(new_resource)
   cmd = primitive.crm_configure_command
 
-  Chef::Log.info "Creating new resource primitive #{name}"
+  Chef::Log.info "Creating new #{primitive}"
 
   execute cmd do
     action :nothing
@@ -103,14 +103,14 @@ def create_resource(name)
 
   if primitive.exists?
     new_resource.updated_by_last_action(true)
-    Chef::Log.info "Successfully configured primitive '#{name}'."
+    Chef::Log.info "Successfully configured #{primitive}"
   else
-    Chef::Log.error "Failed to configure primitive #{name}."
+    Chef::Log.error "Failed to configure #{primitive}"
   end
 end
 
 def maybe_modify_resource(name)
-  Chef::Log.info "Checking existing resource primitive #{name} for modifications"
+  Chef::Log.info "Checking existing #{@current_cib_object} for modifications"
 
   cmds = []
 
diff --git a/spec/providers/primitive_spec.rb b/spec/providers/primitive_spec.rb
index 796b1ff..376eadb 100644
--- a/spec/providers/primitive_spec.rb
+++ b/spec/providers/primitive_spec.rb
@@ -133,7 +133,7 @@ describe "Chef::Provider::PacemakerPrimitive" do
       expect_definition(definition)
 
       expected_error = \
-        "Existing resource primitive '#{rsc.name}' has agent '#{existing_agent}' " \
+        "Existing primitive resource '#{rsc.name}' has agent '#{existing_agent}' " \
         "but recipe wanted '#{@resource.agent}'"
       expect { provider.run_action :create }.to \
         raise_error(RuntimeError, expected_error)
@@ -166,7 +166,7 @@ describe "Chef::Provider::PacemakerPrimitive" do
       expect_definition(rsc.definition_string)
       expect_running(true)
 
-      expected_error = "Cannot delete running resource primitive #{rsc.name}"
+      expected_error = "Cannot delete running primitive resource '#{rsc.name}'"
       expect { provider.run_action :delete }.to \
         raise_error(RuntimeError, expected_error)