From d34abe2a33413bc8787bd6ca5a6533cc41fd2850 Mon Sep 17 00:00:00 2001
From: Sean Handley <sean.handley@gmail.com>
Date: Sun, 15 Jul 2012 18:04:33 +0200
Subject: [PATCH] Allow DHCP assignment by default.

---
 lib/fog/serverlove/models/compute/server.rb       | 8 +++++++-
 tests/serverlove/requests/compute/server_tests.rb | 6 ++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/fog/serverlove/models/compute/server.rb b/lib/fog/serverlove/models/compute/server.rb
index 49ffda088..f7e2391e2 100644
--- a/lib/fog/serverlove/models/compute/server.rb
+++ b/lib/fog/serverlove/models/compute/server.rb
@@ -21,6 +21,8 @@ module Fog
         attribute :status   
         attribute :user
         attribute :started
+        attribute :nic_0_model, :aliases => 'nic:0:model'
+        attribute :nic_0_dhcp,  :aliases => 'nic:0:dhcp'
         
         def save
           attributes = {}
@@ -30,7 +32,7 @@ module Fog
           else
             requires :name
             requires :cpu
-            attributes = connection.create_server(allowed_attributes).body
+            attributes = connection.create_server(self.defaults.merge(allowed_attributes)).body
           end
           
           merge_attributes(attributes)
@@ -47,6 +49,10 @@ module Fog
           allowed = [:name, :cpu, :mem, :persistent, :vnc_password]
           attributes.select {|k,v| allowed.include? k}
         end
+        
+        def self.defaults
+          { 'nic:0:model' => 'e1000', 'nic:0:dhcp' => 'auto' }
+        end
       end
     end
   end
diff --git a/tests/serverlove/requests/compute/server_tests.rb b/tests/serverlove/requests/compute/server_tests.rb
index 83834a0f2..4e2c118e1 100644
--- a/tests/serverlove/requests/compute/server_tests.rb
+++ b/tests/serverlove/requests/compute/server_tests.rb
@@ -9,7 +9,9 @@ Shindo.tests('Fog::Compute[:serverlove] | server requests', ['serverlove']) do
     'cpu'               => Integer,
     'mem'               => Integer,
     'persistent'        => Fog::Nullable::String,
-    'vnc:password'      => Fog::Nullable::String
+    'vnc:password'      => Fog::Nullable::String,
+    'nic:0:dhcp'        => String,
+    'nic:0:model'       => String
   }
   
   tests('success') do
@@ -17,7 +19,7 @@ Shindo.tests('Fog::Compute[:serverlove] | server requests', ['serverlove']) do
     attributes = { 'name' => 'Test', 'cpu' => '1000', 'mem' => '1000', 'persistent' => 'true' }
 
     tests("#create_server").formats(@server_format) do
-      @server = Fog::Compute[:serverlove].create_server(attributes).body
+      @server = Fog::Compute[:serverlove].create_server(Fog::Compute::Serverlove::Server.defaults.merge(attributes)).body
     end
 
     tests("#list_servers").succeeds do