From ae528f62e898fac37ea7d37c6fcff2e5c0954782 Mon Sep 17 00:00:00 2001 From: Markus Roberts Date: Mon, 19 Oct 2009 09:25:55 -0700 Subject: Ticket #2734 PSON/JSON not serializing classes of a catalog Now it does, there are tests to prove it, and the related tests for tags and version have been strengthend. Signed-off-by: Markus Roberts --- lib/puppet/resource/catalog.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/puppet/resource/catalog.rb b/lib/puppet/resource/catalog.rb index 8ab788ed0..5bf9a8368 100644 --- a/lib/puppet/resource/catalog.rb +++ b/lib/puppet/resource/catalog.rb @@ -418,6 +418,10 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph end end + if classes = data['classes'] + result.add_class(*classes) + end + result end @@ -452,7 +456,8 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph 'name' => name, 'version' => version, 'resources' => vertices.collect { |v| v.to_pson_data_hash }, - 'edges' => edges. collect { |e| e.to_pson_data_hash } + 'edges' => edges. collect { |e| e.to_pson_data_hash }, + 'classes' => classes }, 'metadata' => { 'api_version' => 1 -- cgit