From fbb122e56c74ef223e0740e733beb24c15ee2ef8 Mon Sep 17 00:00:00 2001
From: Dan Peterson <dpiddy@gmail.com>
Date: Tue, 23 Nov 2010 21:59:49 -0400
Subject: [PATCH] change to new attribute handling

---
 .../ecloud/models/backup_internet_service.rb  |  2 +-
 .../ecloud/models/internet_service.rb         | 24 +++++++++----------
 lib/fog/vcloud/terremark/ecloud/models/ip.rb  |  2 +-
 .../vcloud/terremark/ecloud/models/server.rb  |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/fog/vcloud/terremark/ecloud/models/backup_internet_service.rb b/lib/fog/vcloud/terremark/ecloud/models/backup_internet_service.rb
index 126b30dbb..dd91a33fa 100644
--- a/lib/fog/vcloud/terremark/ecloud/models/backup_internet_service.rb
+++ b/lib/fog/vcloud/terremark/ecloud/models/backup_internet_service.rb
@@ -25,7 +25,7 @@ module Fog
 
           def monitor=(new_monitor = {})
             if new_monitor.nil? || new_monitor.empty?
-              @monitor = nil
+              attributes[:monitor] = nil
             end
           end
 
diff --git a/lib/fog/vcloud/terremark/ecloud/models/internet_service.rb b/lib/fog/vcloud/terremark/ecloud/models/internet_service.rb
index c30a3144e..27dde75af 100644
--- a/lib/fog/vcloud/terremark/ecloud/models/internet_service.rb
+++ b/lib/fog/vcloud/terremark/ecloud/models/internet_service.rb
@@ -37,19 +37,19 @@ module Fog
 
           def monitor=(new_monitor = {})
             if new_monitor.nil? || new_monitor.empty?
-              @monitor = nil
+              attributes[:monitor] = nil
             elsif new_monitor.is_a?(Hash)
-              @monitor = {}
-              @monitor[:type] = new_monitor[:MonitorType] || new_monitor[:type]
-              @monitor[:url_send_string] = new_monitor[:UrlSendString] || new_monitor[:url_send_string]
-              @monitor[:http_headers] = new_monitor[:HttpHeader] || new_monitor[:http_headers]
-              @monitor[:http_headers] = @monitor[:http_headers].split("\n") unless @monitor[:http_headers].is_a?(Array)
-              @monitor[:receive_string] = new_monitor[:ReceiveString] || new_monitor[:receive_string]
-              @monitor[:interval] = new_monitor[:Interval] || new_monitor[:interval]
-              @monitor[:response_timeout] = new_monitor[:ResponseTimeOut] || new_monitor[:response_timeout]
-              @monitor[:downtime] = new_monitor[:DownTime] || new_monitor[:downtime]
-              @monitor[:retries] = new_monitor[:Retries] || new_monitor[:retries]
-              @monitor[:is_enabled] = new_monitor[:IsEnabled] || new_monitor[:is_enabled]
+              attributes[:monitor] = {}
+              attributes[:monitor][:type] = new_monitor[:MonitorType] || new_monitor[:type]
+              attributes[:monitor][:url_send_string] = new_monitor[:UrlSendString] || new_monitor[:url_send_string]
+              attributes[:monitor][:http_headers] = new_monitor[:HttpHeader] || new_monitor[:http_headers]
+              attributes[:monitor][:http_headers] = attributes[:monitor][:http_headers].split("\n") unless attributes[:monitor][:http_headers].is_a?(Array)
+              attributes[:monitor][:receive_string] = new_monitor[:ReceiveString] || new_monitor[:receive_string]
+              attributes[:monitor][:interval] = new_monitor[:Interval] || new_monitor[:interval]
+              attributes[:monitor][:response_timeout] = new_monitor[:ResponseTimeOut] || new_monitor[:response_timeout]
+              attributes[:monitor][:downtime] = new_monitor[:DownTime] || new_monitor[:downtime]
+              attributes[:monitor][:retries] = new_monitor[:Retries] || new_monitor[:retries]
+              attributes[:monitor][:is_enabled] = new_monitor[:IsEnabled] || new_monitor[:is_enabled]
             else
               raise RuntimeError.new("monitor needs to either be nil or a Hash")
             end
diff --git a/lib/fog/vcloud/terremark/ecloud/models/ip.rb b/lib/fog/vcloud/terremark/ecloud/models/ip.rb
index 568074c91..20d0a15a7 100644
--- a/lib/fog/vcloud/terremark/ecloud/models/ip.rb
+++ b/lib/fog/vcloud/terremark/ecloud/models/ip.rb
@@ -15,7 +15,7 @@ module Fog
           attribute :id, :aliases => :Id, :type => :integer
 
           def rnat=(new_rnat)
-            @rnat = new_rnat
+            attribute[:rnat] = new_rnat
             @changed = true
           end
 
diff --git a/lib/fog/vcloud/terremark/ecloud/models/server.rb b/lib/fog/vcloud/terremark/ecloud/models/server.rb
index f8a1972d7..b1cd57870 100644
--- a/lib/fog/vcloud/terremark/ecloud/models/server.rb
+++ b/lib/fog/vcloud/terremark/ecloud/models/server.rb
@@ -75,7 +75,7 @@ module Fog
           end
 
           def name=(new_name)
-            @name = new_name
+            attributes[:name] = new_name
             @changed = true
           end