From d8e9ff71a6a102bfacec920051550130c55b13a4 Mon Sep 17 00:00:00 2001
From: Dan Peterson <dpiddy@gmail.com>
Date: Fri, 15 Oct 2010 18:13:25 -0300
Subject: [PATCH] it gets called like this actually

---
 lib/fog/vcloud.rb                                      | 10 +++++-----
 spec/vcloud/terremark/ecloud/requests/power_on_spec.rb |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/fog/vcloud.rb b/lib/fog/vcloud.rb
index ea9f1a8ac..7e5bc4b1e 100644
--- a/lib/fog/vcloud.rb
+++ b/lib/fog/vcloud.rb
@@ -328,7 +328,7 @@ module Fog
                     },
                   ],
                   :vms => [
-                    { :href => "#{base_url}/vap/41",
+                    { :href => "#{base_url}/vapp/41",
                       :name => "Broom 1",
                       :ip   => "1.2.3.3",
                       :memory => 1024,
@@ -336,11 +336,11 @@ module Fog
                       :disks => [{ :size => 25 }],
                       :status => 2
                     },
-                    { :href => "#{base_url}/vap/42",
+                    { :href => "#{base_url}/vapp/42",
                       :name => "Broom 2",
                       :ip => "1.2.3.4"
                     },
-                    { :href => "#{base_url}/vap/43",
+                    { :href => "#{base_url}/vapp/43",
                       :name => "Email!"
                     }
                   ]
@@ -394,8 +394,8 @@ module Fog
       end
 
       def vapp_and_vdc_from_vapp_uri(uri)
-        if vdc = mock_data[:organizations].map {|o| o[:vdcs] }.flatten.detect {|vd| vd[:vms].detect {|vm| vm[:href] == uri } }
-          vapp = vdc[:vms].detect {|v| v[:href] == uri }
+        if vdc = mock_data[:organizations].map {|o| o[:vdcs] }.flatten.detect {|vd| vd[:vms].detect {|vm| uri =~ %r{^#{Regexp.escape(vm[:href])}($|/)} } }
+          vapp = vdc[:vms].detect {|v| uri =~ %r{^#{Regexp.escape(v[:href])}($|/)} }
           if vapp
             [vapp, vdc]
           end
diff --git a/spec/vcloud/terremark/ecloud/requests/power_on_spec.rb b/spec/vcloud/terremark/ecloud/requests/power_on_spec.rb
index a339be956..05ece720d 100644
--- a/spec/vcloud/terremark/ecloud/requests/power_on_spec.rb
+++ b/spec/vcloud/terremark/ecloud/requests/power_on_spec.rb
@@ -9,7 +9,7 @@ if Fog.mocking?
     describe :power_on, :type => :vcloud_request do
       context "with a valid vapp uri" do
         let(:vm_data) { @vcloud.mock_data[:organizations].first[:vdcs].first[:vms].first }
-        before { vm_data[:status] = 2; @power_on = @vcloud.power_on(@vcloud.vdcs.first.servers.first.href) }
+        before { vm_data[:status] = 2; @power_on = @vcloud.power_on(@vcloud.vdcs.first.servers.first.href + "/power/action/powerOn") }
         subject { @power_on }
 
         it_should_behave_like "all responses"