From db406ab85fc2c7b8484dfaf69e411e25eddd16b5 Mon Sep 17 00:00:00 2001
From: geemus <geemus@gmail.com>
Date: Sun, 25 Apr 2010 11:42:35 -0700
Subject: [PATCH] [terremark] fix leftover post-rebase issues

---
 lib/fog/terremark/models/shared/task.rb       |  4 ++-
 .../requests/shared/delete_public_ip.rb       | 36 ++++++++++---------
 .../shared/instantiate_vapp_template.rb       |  6 ++--
 lib/fog/terremark/shared.rb                   |  1 +
 lib/fog/terremark/vcloud.rb                   |  2 +-
 5 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/lib/fog/terremark/models/shared/task.rb b/lib/fog/terremark/models/shared/task.rb
index 7c0d67720..d97eb2867 100644
--- a/lib/fog/terremark/models/shared/task.rb
+++ b/lib/fog/terremark/models/shared/task.rb
@@ -19,7 +19,9 @@ module Fog
           new_result = attributes.delete('Result')
           super
           @owner  = connection.parse(new_owner)
-          @result = connection.parse(new_result)
+          if new_result
+            @result = connection.parse(new_result)
+          end
         end
 
         def ready?
diff --git a/lib/fog/terremark/requests/shared/delete_public_ip.rb b/lib/fog/terremark/requests/shared/delete_public_ip.rb
index da347c78f..3e56856d3 100644
--- a/lib/fog/terremark/requests/shared/delete_public_ip.rb
+++ b/lib/fog/terremark/requests/shared/delete_public_ip.rb
@@ -1,28 +1,30 @@
 module Fog
   module Terremark
-    class Real
+    module Shared
+      module Real
+
+        # Destroy a public ip
+        #
+        # ==== Parameters
+        # * public_ip_id<~Integer> - Id of public ip to destroy
+        #
+        def delete_public_ip(public_ip_id)
+          request(
+            :expects  => 200,
+            :method   => 'DELETE',
+            :path     => "publicIps/#{public_ip_id}"
+          )
+        end
 
-      # Destroy a public ip
-      #
-      # ==== Parameters
-      # * public_ip_id<~Integer> - Id of public ip to destroy
-      #
-      def delete_public_ip(public_ip_id)
-        request(
-          :expects  => 200,
-          :method   => 'DELETE',
-          :path     => "publicIps/#{public_ip_id}"
-        )
       end
 
-    end
+      module Mock
 
-    class Mock
+        def delete_public_ip(public_ip_id)
+          raise MockNotImplemented.new("Contributions welcome!")
+        end
 
-      def delete_public_ip(public_ip_id)
-        raise MockNotImplemented.new("Contributions welcome!")
       end
-
     end
   end
 end
diff --git a/lib/fog/terremark/requests/shared/instantiate_vapp_template.rb b/lib/fog/terremark/requests/shared/instantiate_vapp_template.rb
index f861056bb..819846b8f 100644
--- a/lib/fog/terremark/requests/shared/instantiate_vapp_template.rb
+++ b/lib/fog/terremark/requests/shared/instantiate_vapp_template.rb
@@ -1,7 +1,7 @@
 module Fog
   module Terremark
     module Shared
-      class Real
+      module Real
 
         # Instatiate a vapp template
         #
@@ -60,14 +60,14 @@ DATA
             :expects => 200,
             :headers => { 'Content-Type' => 'application/vnd.vmware.vcloud.instantiateVAppTemplateParams+xml' },
             :method => 'POST',
-            :parser => Fog::Parsers::Terremark::InstantiateVappTemplate.new,
+            :parser => Fog::Parsers::Terremark::Shared::InstantiateVappTemplate.new,
             :path => "vdc/#{options['vdc_id']}/action/instantiatevAppTemplate"
           )
         end
 
       end
 
-      class Mock
+      module Mock
 
         def instatiate_vapp_template(vapp_template_id)
           raise MockNotImplemented.new("Contributions welcome!")
diff --git a/lib/fog/terremark/shared.rb b/lib/fog/terremark/shared.rb
index 6e0512daf..41ef9a6c2 100644
--- a/lib/fog/terremark/shared.rb
+++ b/lib/fog/terremark/shared.rb
@@ -108,6 +108,7 @@ module Fog
         require 'fog/terremark/requests/shared/add_node_service'
         require 'fog/terremark/requests/shared/create_internet_service'
         require 'fog/terremark/requests/shared/delete_internet_service'
+        require 'fog/terremark/requests/shared/delete_public_ip'
         require 'fog/terremark/requests/shared/delete_node_service'
         require 'fog/terremark/requests/shared/delete_vapp'
         require 'fog/terremark/requests/shared/deploy_vapp'
diff --git a/lib/fog/terremark/vcloud.rb b/lib/fog/terremark/vcloud.rb
index 324e3604a..a904f4537 100644
--- a/lib/fog/terremark/vcloud.rb
+++ b/lib/fog/terremark/vcloud.rb
@@ -75,7 +75,7 @@ module Fog
             @default_public_ip_id ||= begin
               ips = get_public_ips(default_vdc_id).body['PublicIpAddresses']
               if ips.length == 1
-                ips.first['Href'].split('/').last.to_i
+                ips.first['href'].split('/').last.to_i
               else
                 nil
               end