Fixing node webui for 3 attrs

Author: adamhjk

chef-server-api/app/controllers/nodes.rb

@@ -67,7 +67,7 @@ def update
 
 updated=params['inflated_object']
 @node.run_list.reset!(updated.run_list)
-@node.attribute=updated.attribute
+@node.normal_attrs=updated.normal_attrs
 @node.override_attrs=updated.override_attrs
 @node.default_attrs=updated.default_attrs
 @node.cdb_save

chef-server-webui/app/controllers/nodes.rb

@@ -86,14 +86,14 @@ def create
 begin
 @node=Chef::Node.new
 @node.nameparams[:name]
-@node.attribute=JSON.parse(params[:attributes])
+@node.normal_attrs=JSON.parse(params[:attributes])
 @node.run_list.reset!(params[:for_node] ? params[:for_node] : [])
 raiseArgumentError,"Node name cannot be blank"if(params[:name].nil? || params[:name].length==0)
 @node.create
 redirect(slice_url(:nodes),:message=>{:notice=>"Created Node #{@node.name}"})
 rescue=>e
 Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-@node.attribute=JSON.parse(params[:attributes])
+@node.normal_attrs=JSON.parse(params[:attributes])
 @available_recipes=get_available_recipes
 @available_roles=Chef::Role.list.keys.sort
 @node.run_listparams[:for_node]
@@ -107,7 +107,7 @@ def update
 begin
 @node=Chef::Node.load(params[:id])
 @node.run_list.reset!(params[:for_node] ? params[:for_node] : [])
-@node.attribute=JSON.parse(params[:attributes])
+@node.normal_attrs=JSON.parse(params[:attributes])
 @node.save
 @_message={:notice=>"Updated Node"}
 render:show

chef-server-webui/app/views/nodes/_form.html.haml

@@ -42,7 +42,7 @@
 
  %div.group.form{:style => "position:relative;"}
  %label.label Attributes 
- = partial '../layout/jsonedit', :json =>@node.attribute.to_json
+ = partial '../layout/jsonedit', :json =>@node.normal_attrs.to_json
  %div.group.form
  %span.description A JSON hash for default attributes for nodes of this node. These attributes will only be applied if the node does not already have a value for the attributes.
 

chef-server-webui/app/views/nodes/show.html.haml

@@ -56,5 +56,5 @@
 
  .left
  %h3 Attributes
- = build_tree('attrs', @node.attribute, default_attrs, override_attrs)
+ = build_tree('attrs', @node.normal_attrs, default_attrs, override_attrs)
 

chef/lib/chef/node.rb

@@ -195,6 +195,10 @@ def name(arg=nil)
 defattribute
 Chef::Node::Attribute.new(@normal_attrs,@default_attrs,@override_attrs)
 end
+
+defattribute=(value)
+@normal_attrs=value
+end
 
 # Return an attribute of this node. Returns nil if the attribute is not found.
 def [](attrib)
@@ -212,25 +216,25 @@ def store(attrib, value)
 
 # Set a normal attribute of this node, but auto-vivifiy any Mashes that
 # might be missing
-defset
+defnormal
 attrs=Chef::Node::Attribute.new(@normal_attrs,@default_attrs,@override_attrs)
 attrs.set_type=:normal
 attrs.auto_vivifiy_on_read=true
 attrs
 end
 
-alias_method:normal,:set
+alias_method:set,:normal
 
 # Set a normal attribute of this node, auto-vivifiying any mashes that are
 # missing, but if the final value already exists, don't set it
-defset_unless
+defnormal_unless
 attrs=Chef::Node::Attribute.new(@normal_attrs,@default_attrs,@override_attrs)
 attrs.set_type=:normal
 attrs.auto_vivifiy_on_read=true
 attrs.set_unless_value_present=true
 attrs
 end
-alias_method:normal_unless,:set_unless
+alias_method:set_unless,:normal_unless
 
 # Set a default of this node, but auto-vivifiy any Mashes that might
 # be missing
@@ -293,7 +297,10 @@ def each_attribute(&block)
 # to set the attribute values. Otherwise, we'll wind up just returning the attributes
 # value.
 defmethod_missing(symbol, *args)
-Chef::Node::Attribute.new(@normal_attrs,@default_attrs,@override_attrs).send(symbol, *args)
+attrs=Chef::Node::Attribute.new(@normal_attrs,@default_attrs,@override_attrs)
+attrs.set_type=:normal
+attrs.auto_vivify_on_read=true
+attrs.send(symbol, *args)
 end
 
 # Returns true if this Node expects a given recipe, false if not.
@@ -342,9 +349,9 @@ def to_hash
 index_hash=Hash.new
 index_hash["chef_type"]="node"
 index_hash["name"]=@name
-index_hash["normal"]=@normal_attrs
-index_hash["default"]=@default_attrs
-index_hash["override"]=@override_attrs
+attribute.eachdo |key,value|
+index_hash[key]=value
+end
 index_hash["recipe"]=@run_list.recipesif@run_list.recipes.length > 0
 index_hash["role"]=@run_list.rolesif@run_list.roles.length > 0
 index_hash["run_list"]=@run_list.run_listif@run_list.run_list.length > 0

chef/spec/unit/node_spec.rb

@@ -327,9 +327,9 @@
 @node.run_list << "role[leninist]"
 @node.run_list << "recipe[stalinist]"
 h=@node.to_hash
-h["default"].should == @node.default_attrs
-h["override"].should == @node.override_attrs
-h["normal"].should == @node.normal_attrs
+h["one"]["two"].should == "three"
+h["one"]["four"].should == "six"
+h["one"]["eight"].should == "nine"
 h["role"].shouldbe_include("marxist")
 h["role"].shouldbe_include("leninist")
 h["run_list"].shouldbe_include("role[marxist]")