Paired-with: Jesse Wolfe <[email protected]>
Signed-off-by: Paul Berry <[email protected]>
---
Local-branch: ticket/next/5743
app/models/resource_event.rb | 1 -
...10105234202_remove_tags_from_resource_events.rb | 9 +++++++++
db/schema.rb | 3 +--
lib/puppet/report.rb | 5 ++---
spec/lib/puppet/report_spec.rb | 2 --
spec/models/report_spec.rb | 7 ++-----
6 files changed, 14 insertions(+), 13 deletions(-)
create mode 100644
db/migrate/20110105234202_remove_tags_from_resource_events.rb
diff --git a/app/models/resource_event.rb b/app/models/resource_event.rb
index c29c036..433ff87 100644
--- a/app/models/resource_event.rb
+++ b/app/models/resource_event.rb
@@ -1,7 +1,6 @@
class ResourceEvent < ActiveRecord::Base
belongs_to :resource_status
- serialize :tags, Array
serialize :desired_value
serialize :previous_value
serialize :historical_value
diff --git a/db/migrate/20110105234202_remove_tags_from_resource_events.rb
b/db/migrate/20110105234202_remove_tags_from_resource_events.rb
new file mode 100644
index 0000000..b255cb8
--- /dev/null
+++ b/db/migrate/20110105234202_remove_tags_from_resource_events.rb
@@ -0,0 +1,9 @@
+class RemoveTagsFromResourceEvents < ActiveRecord::Migration
+ def self.up
+ remove_column :resource_events, :tags
+ end
+
+ def self.down
+ add_column :resource_events, :tags, :string
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 413e279..8e0f2a6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -9,7 +9,7 @@
#
# It's strongly recommended to check this file into your version control
system.
-ActiveRecord::Schema.define(:version => 20110105233640) do
+ActiveRecord::Schema.define(:version => 20110105234202) do
create_table "assignments", :force => true do |t|
t.integer "node_id"
@@ -133,7 +133,6 @@ ActiveRecord::Schema.define(:version => 20110105233640) do
t.string "name"
t.string "property"
t.string "status"
- t.string "tags"
t.datetime "time"
t.string "historical_value"
t.boolean "audited"
diff --git a/lib/puppet/report.rb b/lib/puppet/report.rb
index 15101e0..5ca7932 100644
--- a/lib/puppet/report.rb
+++ b/lib/puppet/report.rb
@@ -32,8 +32,8 @@ module Puppet #:nodoc:
end
class Event
- attr_reader :name, :default_log_level, :property, :line, :resource,
- :desired_value, :time, :tags, :version, :file,
+ attr_reader :name, :property,
+ :desired_value, :time,
:status, :previous_value, :message
def to_hash
@@ -44,7 +44,6 @@ module Puppet #:nodoc:
"name" => name.to_s,
"property" => property,
"status" => status,
- "tags" => tags,
"time" => time
}
end
diff --git a/spec/lib/puppet/report_spec.rb b/spec/lib/puppet/report_spec.rb
index 85f75ee..ccb98ff 100644
--- a/spec/lib/puppet/report_spec.rb
+++ b/spec/lib/puppet/report_spec.rb
@@ -255,7 +255,6 @@ describe Puppet::Transaction::Report do
"name" => "service_started",
"property" => "ensure",
"status" => "success",
- "tags" => ["service", "mysqld", "node", "default",
"class"],
"time" => Time.parse("2010-07-22 12:19:48.921431
-07:00")
}],
"version" => 1279826342
@@ -308,7 +307,6 @@ describe Puppet::Transaction::Report do
"name" => "executed_command",
"property" => "returns",
"status" => "success",
- "tags" => ["exec", "node", "default", "class"],
"time" => Time.parse("2010-07-22 12:19:47.360626
-07:00")
}],
"version" => 1279826342
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index 5139e3e..acf5054 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -368,14 +368,11 @@ HEREDOC
t.property,
t.previous_value,
t.desired_value,
- #t.message,
t.name,
- #t.source_description,
t.status,
- t.tags.sort,
] }.should =~ [
- [ 'returns' , :notrun , ['0'] , 'executed_command' , 'success' ,
['class' , 'default' , 'exec' , 'node'] ],
- [ 'ensure' , :stopped , :running , 'service_started' , 'success' ,
['class' , 'default' , 'mysqld' , 'node' , 'service']],
+ [ 'returns' , :notrun , ['0'] , 'executed_command' , 'success' ],
+ [ 'ensure' , :stopped , :running , 'service_started' , 'success' ],
]
report.logs.map { |t| [
--
1.7.2
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
