From e5c9d7da85c7439a23a6aa2a38c3792e92c32a53 Mon Sep 17 00:00:00 2001 From: Dan Peterson Date: Mon, 22 Nov 2010 11:59:50 -0400 Subject: [PATCH] fixes --- lib/fog/vcloud/terremark/ecloud.rb | 18 +++++++++++------- .../requests/configure_internet_service.rb | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/fog/vcloud/terremark/ecloud.rb b/lib/fog/vcloud/terremark/ecloud.rb index 2dea2216e..a39680250 100644 --- a/lib/fog/vcloud/terremark/ecloud.rb +++ b/lib/fog/vcloud/terremark/ecloud.rb @@ -68,7 +68,17 @@ module Fog request :power_reset request :power_shutdown + module Shared + def ecloud_xmlns + { + "xmlns" => "urn:tmrk:eCloudExtensions-2.5", + "xmlns:i" => "http://www.w3.org/2001/XMLSchema-instance" + } + end + end + class Mock < Fog::Vcloud::Mock + include Shared def initialize(options={}) end @@ -157,19 +167,13 @@ module Fog end end - def ecloud_xmlns - { - "xmlns" => "urn:tmrk:eCloudExtensions-2.5", - "xmlns:i" => "http://www.w3.org/2001/XMLSchema-instance" - } - end - def mock_data Fog::Vcloud::Terremark::Ecloud::Mock.data end end class Real < Fog::Vcloud::Real + include Shared def supporting_versions ["v0.8b-ext2.5", "0.8b-ext2.5"] diff --git a/lib/fog/vcloud/terremark/ecloud/requests/configure_internet_service.rb b/lib/fog/vcloud/terremark/ecloud/requests/configure_internet_service.rb index 016a33f11..8df506424 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/configure_internet_service.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/configure_internet_service.rb @@ -55,7 +55,7 @@ module Fog builder.Href(ip_address_data[:href]) builder.Name(ip_address_data[:name]) } - if monitor = public_ip_internet_service.monitor + if monitor = service_data[:monitor] generate_monitor_section(builder, monitor) end if service_data[:backup_service_uri]