fog 1.17.0 → 1.18.0

data/fogkeytest1.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA85iKKmz7OgRQzsgb4Dpy8DtWxdx3hI89lykGBqZknhrg7Zhi
+xN02pn/dqpn5tGlvnXg+ijpfzXezkw3e/gPWY89bP0mN6qCAvDZ625IV2oAOU+no
+YREs11KnZGOZRboCIZdK9CGUypW09xK65OUe6RTFPvEzRbw/EsgIyJR0PyjuYw3w
+Vlct9iX6tPnvlBqmqdQwlNojIcRD+uR66YP4JOQS5cM8Cp+lg8g83YsFDpisrCQb
+19XN7C8GveF4vQDhR548I3zF/OmUuPSxEngwFfBt3GLYsqpfqLHlgGdb8qKYPrug
+rdOmiTWNDWsd+pHIx/c6P05luvPHkyfPbQ1UpwIDAQABAoIBAQDjcDsgnZx7cOga
+CZCtbSU/08eS+ePFqxAwgKcVsmojjKkSbcNaV8jc8GoBDb6tifwipNCPsy0b5HWQ
+CdV4ihC0JDjoAD83ICDSmnNfayhoWEQIaU8EwkqByLRt8Oh8x82Rm3bqNih8dgb+
+4UgKyzpvGWuI9x+OLtMdMBOzY5ieFkEYYSMuQcEIQSL3y+ah3le6THAYj9eDq6rs
+QA11fP7Vi/aRhEk8p4Em6Vt4zRCTCGFSPHq75m8Ux4UzqPQYnMfGhO5H3nKzLml/
+DW3hGlIeeKJ69eevYBA0bQRGx9cOO66EvLlA/WaGmGRfL3R5kgY/wh8jOITgGvSU
+kLLgs6qBAoGBAPuIpEWd15av9Xj9a+eb27GiAw9+I9mfQ7PCJ8V2osQy/nJVqA5/
+OJlhp237U4RnH69hnYZb+tylA8YbAIwU6/p9sty/nyHtE0YmH5uZPDGtUu8/bcet
+4kKk+bGxrZc1z2H0B4JpkrjDyYPrl195F8sDElWXjp8fw4c3dh25HMFHAoGBAPfr
+0OFe3xljDEEMzEykSrtTjshbWZWp0MmOJbQyEGbmZZjxQZkHKU4omBEaOc5jAbgj
++Dvmqxf9IcFuLiGbb1OALLw5C/5n8OVH21SWJI9coUXM4CuhRP1orNyUFAUOrhdb
+GTRf2tlJsJGfY4W0JbUZbZ7snTWyglL8aM7oVYGhAoGAKKUV1mIBGkpoohphO1XG
+FFgXooNBi8Lej8eJ4bCf8JBE6XjJ5T3NiYtsIKuB/V0kk5R0feeTC+BmUba/SeN/
+lkSFiII2VqcWfDlg1iXWwjg9tIdNV/zTGO3Lo1kQseRyFGP4aqxglxacE4MYPMc2
+fwmKBuasly3szIa7wWXOLbUCgYA5zZF1+lip4p4IzKMVe3ixFFpF/IZ2jpFPbQT9
+bm7EjxNBBX713uWSg4Rw+Fxh8lOES16lGLLrdOlZ4AaBb2wVW90SRXq2ZiWUT5yj
+rB36Du7LB2l8wq0DKFSlWSERzMpqR6MowvCTmMrCKRdbJRVlk/grBZ/h1SztjEwj
+caf+AQKBgQDaIJXv6plTi31cRJuthUg/BDbIDcMHouXEnUHqHWZ2emYBsK6V97tx
+0OmJVq4XbbbULrnk5J5tZZPuQ6rTa1vq69UDTIP9XPPNAhN7MdXSqGe1XLBnd1mw
+USLd5uQWynf5ry65KcWF7lx7zKtD2gEhmM/pEdUCspKZpvhUu0ViTA==
+-----END RSA PRIVATE KEY-----

data/lib/fog/aws/compute.rb

@@ -223,7 +223,6 @@ module Fog
                 :subnets => [],
                 :vpcs => [],
                 :dhcp_options => [],
-                :internet_gateways => [],
                 :route_tables => [],
                 :account_attributes => [
                   {

data/lib/fog/aws/data_pipeline.rb

@@ -92,7 +92,6 @@ module Fog
           # Params for all DataPipeline requests
           params.merge!({
             :expects => 200,
-            :host => @host,
             :method => :post,
             :path => '/',
           })

data/lib/fog/aws/models/auto_scaling/group.rb

@@ -25,7 +25,7 @@ module Fog
         attribute :vpc_zone_identifier,       :aliases => 'VPCZoneIdentifier'
 
         def initialize(attributes={})
-          attributes['Instances'] = []
+          self.instances = []
           self.default_cooldown = 300
           self.desired_capacity = 0
           self.enabled_metrics = []

data/lib/fog/aws/models/compute/route_table.rb

@@ -30,7 +30,7 @@ module Fog
         def destroy
           requires :id
 
-          service.delete_route_table (id)
+          service.delete_route_table(id)
           true
         end
 

data/lib/fog/aws/models/compute/server.rb

@@ -65,7 +65,7 @@ module Fog
           prepare_service_value(attributes)
 
           self.image_id   ||= begin
-            self.username = 'ubuntu'
+            self.username ||= 'ubuntu'
             case @service.instance_variable_get(:@region) # Ubuntu 10.04 LTS 64bit (EBS)
             when 'ap-northeast-1'
               'ami-5e0fa45f'

data/lib/fog/aws/parsers/compute/describe_internet_gateways.rb

@@ -26,7 +26,7 @@ module Fog
             if @in_tag_set
               case name
                 when 'item'
-                  @vpc['tagSet'][@tag['key']] = @tag['value']
+                  @internet_gateway['tagSet'][@tag['key']] = @tag['value']
                   @tag = {}
                 when 'key', 'value'
                   @tag[name] = value

data/lib/fog/aws/requests/compute/create_internet_gateway.rb

@@ -33,16 +33,17 @@ module Fog
 
       class Mock
         def create_internet_gateway()
-        self.data[:internet_gateways].push({
-          'internetGatewayId' => Fog::AWS::Mock.request_id,
+          gateway_id = Fog::AWS::Mock.internet_gateway_id
+        self.data[:internet_gateways][gateway_id] = {
+          'internetGatewayId' => gateway_id,
           'attachmentSet'     => {},
           'tagSet'            => {}
-        })
+        }
          Excon::Response.new(
             :status => 200,
             :body   => {
               'requestId' => Fog::AWS::Mock.request_id,
-              'internetGatewaySet' => self.data[:internet_gateways]
+              'internetGatewaySet' => [self.data[:internet_gateways][gateway_id]]
             }
           )
         end

data/lib/fog/aws/requests/compute/create_tags.rb

@@ -53,6 +53,8 @@ module Fog
               'snapshot'
             when /^vol\-[a-z0-9]{8}$/i
               'volume'
+            when /^igw\-[a-z0-9]{8}$/i
+              'internet_gateway'
             end
             if type && ((type == 'image' && visible_images[resource_id]) || self.data[:"#{type}s"][resource_id])
               { 'resourceId' => resource_id, 'resourceType' => type }

data/lib/fog/aws/requests/compute/create_volume.rb

@@ -22,7 +22,7 @@ module Fog
         #     * 'createTime'<~Time> - Timestamp for creation
         #     * 'size'<~Integer> - Size in GiBs for volume
         #     * 'snapshotId'<~String> - Snapshot volume was created from, if any
-        #     * 'status's<~String> - State of volume
+        #     * 'status'<~String> - State of volume
         #     * 'volumeId'<~String> - Reference to volume
         #     * 'volumeType'<~String> - Type of volume
         #     * 'iops'<~Integer> - Number of IOPS the volume supports

data/lib/fog/aws/requests/compute/delete_internet_gateway.rb

@@ -30,7 +30,7 @@ module Fog
           Excon::Response.new.tap do |response|
             if internet_gateway_id
               response.status = 200
-              self.data[:internet_gateways].reject! { |v| v['internetGatewayId'] == internet_gateway_id }
+              self.data[:internet_gateways].delete(internet_gateway_id)
             
               response.body = {
                 'requestId' => Fog::AWS::Mock.request_id,

data/lib/fog/aws/requests/compute/describe_internet_gateways.rb

@@ -40,7 +40,7 @@ module Fog
 
       class Mock
         def describe_internet_gateways(filters = {})
-          internet_gateways = self.data[:internet_gateways]
+          internet_gateways = self.data[:internet_gateways].values
 
           if filters['internet-gateway-id']
             internet_gateways = internet_gateways.reject {|internet_gateway| internet_gateway['internetGatewayId'] != filters['internet-gateway-id']}

data/lib/fog/aws/requests/compute/run_instances.rb

@@ -156,7 +156,7 @@ module Fog
               'keyName'             => options['KeyName'],
               'launchTime'          => Time.now,
               'monitoring'          => { 'state' => options['Monitoring.Enabled'] || false },
-              'placement'           => { 'availabilityZone' => options['Placement.AvailabilityZone'] || Fog::AWS::Mock.availability_zone(@region), 'groupName' => nil, 'tenancy' => 'default' },
+              'placement'           => { 'availabilityZone' => options['Placement.AvailabilityZone'] || Fog::AWS::Mock.availability_zone(@region), 'groupName' => nil, 'tenancy' => options['Placement.Tenancy'] || 'default' },
               'privateDnsName'      => nil,
               'productCodes'        => [],
               'reason'              => nil,

data/lib/fog/bin/hp.rb

@@ -5,10 +5,18 @@ class HP < Fog::Bin
       case key
       when :block_storage
         Fog::HP::BlockStorage
+      when :block_storage_v2
+        Fog::HP::BlockStorageV2
       when :cdn
         Fog::CDN::HP
       when :compute
         Fog::Compute::HP
+      when :dns
+        Fog::HP::DNS
+      when :lb
+        Fog::HP::LB
+      when :network
+        Fog::HP::Network
       when :storage
         Fog::Storage::HP
       else
@@ -20,13 +28,22 @@ class HP < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :block_storage
+          Fog::Logger.deprecation "HP Cloud Block Storage V1 service will be soon deprecated. Please use `Fog::HP::BlockStorageV2` provider to use latest HP Cloud Block Storage service."
           Fog::HP::BlockStorage.new
+        when :block_storage_v2
+          Fog::HP::BlockStorageV2.new
         when :cdn
           Fog::Logger.warning("HP[:cdn] is deprecated, use CDN[:hp] instead")
           Fog::CDN.new(:provider => 'HP')
         when :compute
           Fog::Logger.warning("HP[:compute] is deprecated, use Compute[:hp] instead")
           Fog::Compute.new(:provider => 'HP')
+        when :dns
+          Fog::HP::DNS.new
+        when :lb
+          Fog::HP::LB.new
+        when :network
+          Fog::HP::Network.new
         when :storage
           Fog::Logger.warning("HP[:storage] is deprecated, use Storage[:hp] instead")
           Fog::Storage.new(:provider => 'HP')

data/lib/fog/compute.rb

@@ -14,6 +14,17 @@ module Fog
       when :gogrid
         require 'fog/go_grid/compute'
         Fog::Compute::GoGrid.new(attributes)
+      when :hp
+        version = attributes.delete(:version)
+        version = version.to_s.downcase.to_sym unless version.nil?
+        if version == :v2
+          require 'fog/hp/compute_v2'
+           Fog::Compute::HPV2.new(attributes)
+        else
+          Fog::Logger.deprecation "HP Cloud Compute V1 service will be soon deprecated. Please use `:version => v2` attribute to use HP Cloud Compute V2 service."
+          require 'fog/hp/compute'
+          Fog::Compute::HP.new(attributes)
+        end
       when :new_servers
         require 'fog/bare_metal_cloud/compute'
         Fog::Logger.deprecation "`new_servers` is deprecated. Please use `bare_metal_cloud` instead."

data/lib/fog/ecloud/compute.rb

@@ -10,8 +10,10 @@ module Fog
       attr_reader :authentication_method, :version
 
       #### Credentials
-      #requires 
-      recognizes :ecloud_username, :ecloud_password, :ecloud_version, :ecloud_access_key, :ecloud_private_key, :ecloud_authentication_method
+      #requires
+      recognizes :ecloud_username, :ecloud_password, :ecloud_version,
+                 :ecloud_access_key, :ecloud_private_key,
+                 :ecloud_authentication_method
 
       #### Models
       model_path 'fog/ecloud/models/compute'
@@ -245,6 +247,7 @@ module Fog
 
       module Shared
 
+        attr_accessor :base_path
         attr_reader :versions_uri
 
         def validate_data(required_opts = [], options = {})
@@ -258,7 +261,7 @@ module Fog
         end
 
         def default_organization_uri
-          "/cloudapi/ecloud/organizations/"
+          "#{@base_path}/organizations"
         end
       end
 
@@ -283,6 +286,7 @@ module Fog
 
         def initialize(options = {})
           require 'fog/core/parser'
+          @base_path               = options[:base_path] || '/cloudapi/ecloud'
           @connections             = {}
           @connection_options      = options[:connection_options] || {}
           @host                    = options[:ecloud_host] || API_URL
@@ -793,6 +797,7 @@ module Fog
         end
 
         def initialize(options={})
+          @base_path = '/cloudapi/ecloud'
           @ecloud_api_key = options[:ecloud]
         end
 

data/lib/fog/ecloud/models/compute/admin_organization.rb

@@ -11,19 +11,19 @@ module Fog
         attribute :support_access,      :aliases => :SupportAccess
 
         def ssh_keys
-          @ssh_keys = Fog::Compute::Ecloud::SshKeys.new(:service => service, :href => "/cloudapi/ecloud/admin/sshKeys/organizations/#{organization.id}")
+          @ssh_keys = Fog::Compute::Ecloud::SshKeys.new(:service => service, :href => "#{service.base_path}/admin/sshKeys/organizations/#{organization.id}")
         end
 
         def password_complexity_rules
-          @password_complexity_rules = Fog::Compute::Ecloud::PasswordComplexityRules.new(:service => service, :href => "/cloudapi/ecloud/admin/organizations/#{organization.id}/passwordComplexityRules")
+          @password_complexity_rules = Fog::Compute::Ecloud::PasswordComplexityRules.new(:service => service, :href => "#{service.base_path}/admin/organizations/#{organization.id}/passwordComplexityRules")
         end
 
         def login_banner
-          @login_banner = Fog::Compute::Ecloud::LoginBanner.new(:service => service, :href => "/cloudapi/ecloud/admin/organizations/#{organization.id}/loginBanner")
+          @login_banner = Fog::Compute::Ecloud::LoginBanner.new(:service => service, :href => "#{service.base_path}/admin/organizations/#{organization.id}/loginBanner")
         end
 
         def authentication_levels
-          @authentication_levels = Fog::Compute::Ecloud::AuthenticationLevels.new(:service => service, :href => "/cloudapi/ecloud/admin/organizations/#{organization.id}/authenticationLevels")
+          @authentication_levels = Fog::Compute::Ecloud::AuthenticationLevels.new(:service => service, :href => "#{service.base_path}/admin/organizations/#{organization.id}/authenticationLevels")
         end
 
         def id

data/lib/fog/ecloud/models/compute/catalog_item.rb

@@ -12,7 +12,7 @@ module Fog
         attribute :files, :aliases => :Files
 
         def configuration
-          @configuration = Fog::Compute::Ecloud::CatalogConfigurations.new(:service => service, :href => "/cloudapi/ecloud/admin/catalog/#{id}/configuration")
+          @configuration = Fog::Compute::Ecloud::CatalogConfigurations.new(:service => service, :href => "#{service.base_path}/admin/catalog/#{id}/configuration")
         end
 
         def id

data/lib/fog/ecloud/models/compute/compute_pool.rb

@@ -15,37 +15,37 @@ module Fog
         attribute :memory_burst, :aliases => :MemoryBurst
 
         def servers
-          @servers ||= Fog::Compute::Ecloud::Servers.new( :service => service, :href => "/cloudapi/ecloud/virtualMachines/computePools/#{id}" )
+          @servers ||= Fog::Compute::Ecloud::Servers.new( :service => service, :href => "#{service.base_path}/virtualMachines/computePools/#{id}" )
         end
 
         def layout
-          @layout ||= Fog::Compute::Ecloud::Layouts.new(:service => service, :href => "/cloudapi/ecloud/layout/computePools/#{id}").first
+          @layout ||= Fog::Compute::Ecloud::Layouts.new(:service => service, :href => "#{service.base_path}/layout/computePools/#{id}").first
         end
 
         def cpu_usage
 #          time ? query = "/details?time=#{Time.parse(time).utc.strftime('%Y-%m-%dT%H:%M:%SZ')}" : query = ""
-          @cpu_usage ||= Fog::Compute::Ecloud::CpuUsageDetailSummary.new(:service => service, :href => "/cloudapi/ecloud/computePools/#{id}/usage/cpu")
+          @cpu_usage ||= Fog::Compute::Ecloud::CpuUsageDetailSummary.new(:service => service, :href => "#{service.base_path}/computePools/#{id}/usage/cpu")
         end
 
         def memory_usage
 #          time ? query = "/details?time=#{Time.parse(time).utc.strftime('%Y-%m-%dT%H:%M:%SZ')}" : query = ""
-          @memory_usage ||= Fog::Compute::Ecloud::MemoryUsageDetailSummary.new(:service => service, :href => "/cloudapi/ecloud/computePools/#{id}/usage/memory")
+          @memory_usage ||= Fog::Compute::Ecloud::MemoryUsageDetailSummary.new(:service => service, :href => "#{service.base_path}/computePools/#{id}/usage/memory")
         end
 
         def storage_usage
-          @storage_usage ||= Fog::Compute::Ecloud::StorageUsageDetailSummary.new(:service => service, :href => "/cloudapi/ecloud/computePools/#{id}/usage/storage")
+          @storage_usage ||= Fog::Compute::Ecloud::StorageUsageDetailSummary.new(:service => service, :href => "#{service.base_path}/computePools/#{id}/usage/storage")
         end
 
         def operating_system_families
-          @operating_system_families ||= Fog::Compute::Ecloud::OperatingSystemFamilies.new(:service => service, :href => "/cloudapi/ecloud/operatingSystemFamilies/computePools/#{id}")
+          @operating_system_families ||= Fog::Compute::Ecloud::OperatingSystemFamilies.new(:service => service, :href => "#{service.base_path}/operatingSystemFamilies/computePools/#{id}")
         end
 
         def templates
-          @templates ||= self.service.templates(:href => "/cloudapi/ecloud/templates/computePools/#{id}")
+          @templates ||= self.service.templates(:href => "#{service.base_path}/templates/computePools/#{id}")
         end
 
         def detached_disks
-          @detached_disks ||= self.service.detached_disks(:href => "/cloudapi/ecloud/detacheddisks/computepools/#{id}")
+          @detached_disks ||= self.service.detached_disks(:href => "#{service.base_path}/detacheddisks/computepools/#{id}")
         end
 
         def environment

data/lib/fog/ecloud/models/compute/environment.rb

@@ -12,23 +12,23 @@ module Fog
         attribute :other_links, :aliases => :Links, :squash => :Link
 
         def public_ips
-          @public_ips ||= Fog::Compute::Ecloud::PublicIps.new(:service => service, :href => "/cloudapi/ecloud/publicIps/environments/#{id}")
+          @public_ips ||= Fog::Compute::Ecloud::PublicIps.new(:service => service, :href => "#{service.base_path}/publicIps/environments/#{id}")
         end
 
         def internet_services
-          @internet_services ||= Fog::Compute::Ecloud::InternetServices.new(:service => service, :href => "/cloudapi/ecloud/networkSummary/environments/#{id}")
+          @internet_services ||= Fog::Compute::Ecloud::InternetServices.new(:service => service, :href => "#{service.base_path}/networkSummary/environments/#{id}")
         end
 
         def node_services
-          @node_services ||= Fog::Compute::Ecloud::Nodes.new(:service => service, :href => "/cloudapi/ecloud/networkSummary/environments/#{id}")
+          @node_services ||= Fog::Compute::Ecloud::Nodes.new(:service => service, :href => "#{service.base_path}/networkSummary/environments/#{id}")
         end
 
         def backup_internet_services
-          @backup_internet_services ||= Fog::Compute::Ecloud::BackupInternetServices.new(:service => service, :href => "/cloudapi/ecloud/backupInternetServices/environments/#{id}")
+          @backup_internet_services ||= Fog::Compute::Ecloud::BackupInternetServices.new(:service => service, :href => "#{service.base_path}/backupInternetServices/environments/#{id}")
         end
 
         def networks
-          @networks ||= self.service.networks(:href => "/cloudapi/ecloud/networks/environments/#{id}")
+          @networks ||= self.service.networks(:href => "#{service.base_path}/networks/environments/#{id}")
         end
 
         def servers
@@ -45,7 +45,7 @@ module Fog
         end
 
         def layout
-          @layout ||= self.service.layouts(:href => "/cloudapi/ecloud/layout/environments/#{id}").first
+          @layout ||= self.service.layouts(:href => "#{service.base_path}/layout/environments/#{id}").first
         end
 
         def rows
@@ -53,41 +53,41 @@ module Fog
         end
 
         def tasks
-          @tasks ||= Fog::Compute::Ecloud::Tasks.new(:service => service, :href => "/cloudapi/ecloud/tasks/environments/#{id}")
+          @tasks ||= Fog::Compute::Ecloud::Tasks.new(:service => service, :href => "#{service.base_path}/tasks/environments/#{id}")
         end
 
         def firewall_acls
-          @firewall_acls ||= Fog::Compute::Ecloud::FirewallAcls.new(:service => service, :href => "/cloudapi/ecloud/firewallAcls/environments/#{id}")
+          @firewall_acls ||= Fog::Compute::Ecloud::FirewallAcls.new(:service => service, :href => "#{service.base_path}/firewallAcls/environments/#{id}")
         end
 
         def compute_pools
-          @compute_pools ||= Fog::Compute::Ecloud::ComputePools.new(:service => service, :href => "/cloudapi/ecloud/computePools/environments/#{id}")
+          @compute_pools ||= Fog::Compute::Ecloud::ComputePools.new(:service => service, :href => "#{service.base_path}/computePools/environments/#{id}")
         end
 
         def physical_devices
-          @physical_devices ||= Fog::Compute::Ecloud::PhysicalDevices.new(:service => service, :href => "/cloudapi/ecloud/physicalDevices/environments/#{id}")
+          @physical_devices ||= Fog::Compute::Ecloud::PhysicalDevices.new(:service => service, :href => "#{service.base_path}/physicalDevices/environments/#{id}")
         end
 
         def trusted_network_groups
-          @trusted_network_groups ||= Fog::Compute::Ecloud::TrustedNetworkGroups.new(:service => service, :href => "/cloudapi/ecloud/trustedNetworkGroups/environments/#{id}")
+          @trusted_network_groups ||= Fog::Compute::Ecloud::TrustedNetworkGroups.new(:service => service, :href => "#{service.base_path}/trustedNetworkGroups/environments/#{id}")
         end
 
         def catalog
-          @catalog = service.catalog(:href => "/cloudapi/ecloud/admin/catalog/organizations/#{organization.id}")
+          @catalog = service.catalog(:href => "#{service.base_path}/admin/catalog/organizations/#{organization.id}")
         end
 
         def rnats
-          @rnats ||= Fog::Compute::Ecloud::Rnats.new(:service => service, :href => "/cloudapi/ecloud/rnats/environments/#{id}")
+          @rnats ||= Fog::Compute::Ecloud::Rnats.new(:service => service, :href => "#{service.base_path}/rnats/environments/#{id}")
         end
 
         def create_trusted_network_group(options = {})
-          options[:uri] = "/cloudapi/ecloud/trustedNetworkGroups/environments/#{id}/action/createTrustedNetworkGroup"
+          options[:uri] = "#{service.base_path}/trustedNetworkGroups/environments/#{id}/action/createTrustedNetworkGroup"
           data = service.trusted_network_groups_create(options).body
           tng = Fog::Compute::Ecloud::TrustedNetworkGroups.new(:service => service, :href => data[:href])[0]
         end
 
         def create_firewall_acl(options = {})
-          options[:uri] = "/cloudapi/ecloud/firewallAcls/environments/#{id}/action/createFirewallAcl"
+          options[:uri] = "#{service.base_path}/firewallAcls/environments/#{id}/action/createFirewallAcl"
           options[:permission] ||= "deny"
           options[:protocol] ||= "any"
           data = service.firewall_acls_create(options).body

data/lib/fog/ecloud/models/compute/firewall_acl.rb

@@ -15,7 +15,7 @@ module Fog
         attribute :port_range, :aliases => :PortRange
 
         def tasks
-          @tasks = Fog::Compute::Ecloud::Tasks.new(:service => service, :href => "/cloudapi/ecloud/tasks/virtualMachines/#{id}")
+          @tasks = Fog::Compute::Ecloud::Tasks.new(:service => service, :href => "#{service.base_path}/tasks/virtualMachines/#{id}")
         end
 
         def id

data/lib/fog/ecloud/models/compute/internet_service.rb

@@ -27,7 +27,7 @@ module Fog
         end
 
         def monitors
-          @monitors ||= Fog::Compute::Ecloud::Monitors.new(:service => service, :href => "/cloudapi/ecloud/internetServices/#{id}/monitor")
+          @monitors ||= Fog::Compute::Ecloud::Monitors.new(:service => service, :href => "#{service.base_path}/internetServices/#{id}/monitor")
         end
 
         def save