network: Ensure data returned by allocate_ip is correct

When allocate_ip is called, it returns some data representing the
related network information. However, as network attributes can be
overridden by having attributes on a node (to override the conduit for a
specific network on that node, for instance), which is something that
was not reflected here, resulting in incorrect data.

Author: vuntz

crowbar_framework/app/models/network_service.rb

@@ -54,6 +54,7 @@ def allocate_ip_by_type(bc_instance, network, range, object, type, suggestion =
       return [404, "No node found"] if node.nil?
       name = node.name.to_s
     else
+      node = nil
       name = object.to_s
     end
 
@@ -70,7 +71,7 @@ def allocate_ip_by_type(bc_instance, network, range, object, type, suggestion =
     begin
       lock = acquire_ip_lock
       db = Chef::DataBag.load("crowbar/#{network}_network") rescue nil
-      net_info = build_net_info(role, network)
+      net_info = build_net_info(role, network, node)
 
       # Did we already allocate this, but the node lost it?
       if db["allocated_by_name"].key?(name)
@@ -428,13 +429,13 @@ def enable_interface(bc_instance, network, name)
     node.save
 
     Rails.logger.info("Network enable_interface: Assigned: #{name} #{network}")
-    [200, build_net_info(role, network)]
+    [200, build_net_info(role, network, nil)]
   end
 
-  def build_net_info(role, network)
-    net_info = {}
-    role.default_attributes["network"]["networks"][network].each do |k, v|
-      net_info[k] = v unless v.nil?
+  def build_net_info(role, network, node)
+    net_info = role.default_attributes["network"]["networks"][network].to_hash
+    unless node.nil? || node.crowbar.nil?
+      net_info.merge!(node.crowbar["crowbar"]["network"][network] || {})
     end
     net_info
   end