From 759e43f058c7568ea349ec10f9dad0111d8215cd Mon Sep 17 00:00:00 2001
From: Sean Handley <sean.handley@gmail.com>
Date: Mon, 16 Jul 2012 20:50:27 +0200
Subject: [PATCH] Without setting SMP the web UI won't load :-/

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

diff --git a/lib/fog/serverlove/models/compute/server.rb b/lib/fog/serverlove/models/compute/server.rb
index 3ef60969c..d0e2f3067 100644
--- a/lib/fog/serverlove/models/compute/server.rb
+++ b/lib/fog/serverlove/models/compute/server.rb
@@ -11,14 +11,15 @@ module Fog
         attribute :name
         attribute :cpu
         attribute :mem
+        attribute :smp
         attribute :ide_0_0, :aliases => 'ide:0:0'
         attribute :ide_0_1, :aliases => 'ide:0:1'
         attribute :ide_1_0, :aliases => 'ide:1:0'
         attribute :ide_1_1, :aliases => 'ide:1:1'
         attribute :boot
         attribute :persistent
+        attribute :vnc
         attribute :vnc_password, :aliases => 'vnc:password'
-        attribute :vnc,       :aliases => 'vnc'
         attribute :status   
         attribute :user
         attribute :started
@@ -48,7 +49,7 @@ module Fog
         
         def allowed_attributes
           allowed = [
-                      :name, :cpu, :mem, :persistent,
+                      :name, :cpu, :smp, :mem, :persistent,
                       :vnc_password, :vnc,
                       :ide_0_0, :ide_0_1, :ide_1_0, :ide_1_1,
                       :boot, :nic_0_model, :nic_0_dhcp
@@ -59,7 +60,7 @@ module Fog
         def self.defaults
           # TODO: Document default settings.
           # Note that VNC password standards are strict (need explaining)
-          { 'nic:0:model' => 'e1000', 'nic:0:dhcp' => 'auto', 'vnc' => 'auto', 'vnc:password' => 'QXBwKEKQ' }
+          { 'nic:0:model' => 'e1000', 'nic:0:dhcp' => 'auto', 'vnc' => 'auto', 'vnc:password' => 'QXBwKEKQ', 'smp' => 'auto' }
         end
       end
     end
diff --git a/tests/serverlove/requests/compute/server_tests.rb b/tests/serverlove/requests/compute/server_tests.rb
index 9ca60ef4e..f0d333a9a 100644
--- a/tests/serverlove/requests/compute/server_tests.rb
+++ b/tests/serverlove/requests/compute/server_tests.rb
@@ -8,6 +8,7 @@ Shindo.tests('Fog::Compute[:serverlove] | server requests', ['serverlove']) do
     'started'           => Fog::Nullable::String,
     'cpu'               => Integer,
     'mem'               => Integer,
+    'smp'               => Fog::Nullable::String,
     'persistent'        => Fog::Nullable::String,
     'vnc'               => Fog::Nullable::String,
     'vnc:password'      => Fog::Nullable::String,