fog 1.17.0 → 1.18.0

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

@@ -26,7 +26,7 @@ module Fog
         end
 
         def create(options)
-          options[:uri] = "/cloudapi/ecloud/internetServices/publicIps/#{public_ip_id}/action/createInternetService"
+          options[:uri] = "#{service.base_path}/internetServices/publicIps/#{public_ip_id}/action/createInternetService"
           options[:protocol]           ||= "TCP"
           options[:enabled]            ||= true
           options[:description]        ||= ""

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

@@ -11,7 +11,7 @@ module Fog
         attribute :type, :aliases => :Type
 
         def catalog(org_href)
-          @catalog ||= Fog::Compute::Ecloud::Catalog.new(:service => service, :href => "/cloudapi/ecloud/admin/catalog/organizations/#{org_href.scan(/\d+/)[0]}/locations/#{id}")
+          @catalog ||= Fog::Compute::Ecloud::Catalog.new(:service => service, :href => "#{service.base_path}/admin/catalog/organizations/#{org_href.scan(/\d+/)[0]}/locations/#{id}")
         end
 
         def id

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

@@ -18,7 +18,7 @@ module Fog
         attribute :receive_string, :aliases => :ReceiveString
 
         def edit(options = {})
-          href = "/cloudapi/ecloud/internetServices/#{internet_service_id}/monitor?type="
+          href = "#{service.base_path}/internetServices/#{internet_service_id}/monitor?type="
           case type
           when "application/vnd.tmrk.cloud.pingMonitor"
             options[:uri] = href + "ping"

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

@@ -14,7 +14,7 @@ module Fog
         attribute :rnat_address,      :aliases => :RnatAddress
 
         def rnats
-          @rnats ||= Fog::Compute::Ecloud::Rnats.new(:service => service, :href => "cloudapi/ecloud/rnats/networks/#{id}")
+          @rnats ||= Fog::Compute::Ecloud::Rnats.new(:service => service, :href => "#{service.base_path}/rnats/networks/#{id}")
         end
 
         def ips

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

@@ -18,7 +18,7 @@ module Fog
         end
 
         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 delete

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

@@ -26,7 +26,7 @@ module Fog
         end
 
         def create(options)
-          options[:uri] = "/cloudapi/ecloud/nodeServices/internetServices/#{internet_service_id}/action/createNodeService"
+          options[:uri] = "#{service.base_path}/nodeServices/internetServices/#{internet_service_id}/action/createNodeService"
           options[:protocol] ||= "TCP"
           options[:enabled] ||= true
           options[:description] ||= ""

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

@@ -20,51 +20,51 @@ module Fog
         end
 
         def tags
-          @tags ||= self.service.tags(:href => "/cloudapi/ecloud/deviceTags/organizations/#{id}")
+          @tags ||= self.service.tags(:href => "#{service.base_path}/deviceTags/organizations/#{id}")
         end
 
         def admin
-          @admin ||= self.service.admin_organizations.new(:href => "/cloudapi/ecloud/admin/organizations/#{id}")
+          @admin ||= self.service.admin_organizations.new(:href => "#{service.base_path}/admin/organizations/#{id}")
         end
 
         def users
-          @users ||= self.service.users(:href => "/cloudapi/ecloud/admin/users/organizations/#{id}")
+          @users ||= self.service.users(:href => "#{service.base_path}/admin/users/organizations/#{id}")
         end
 
         def support_tickets(type = :open)
           case type
           when :open
-            @support_tickets ||= Fog::Compute::Ecloud::SupportTickets.new(:service => service, :href => "/cloudapi/ecloud/admin/tickets/organizations/#{id}/active")
+            @support_tickets ||= Fog::Compute::Ecloud::SupportTickets.new(:service => service, :href => "#{service.base_path}/admin/tickets/organizations/#{id}/active")
           when :closed
-            @support_tickets ||= Fog::Compute::Ecloud::SupportTickets.new(:service => service, :href => "/cloudapi/ecloud/admin/tickets/organizations/#{id}/closed")
+            @support_tickets ||= Fog::Compute::Ecloud::SupportTickets.new(:service => service, :href => "#{service.base_path}/admin/tickets/organizations/#{id}/closed")
           end
         end
 
         def edit_authentication_levels(options = {})
-          options[:uri] = "/cloudapi/ecloud/admin/organizations/#{id}/authenticationLevels"
+          options[:uri] = "#{service.base_path}/admin/organizations/#{id}/authenticationLevels"
           data = service.admin_edit_authentication_levels(options).body
           level = Fog::Compute::Ecloud::AdminOrganizations.new(:service => service, :href => data[:href])[0]
         end
 
         def edit_password_complexity_rules(options = {})
-          options[:uri] = "/cloudapi/ecloud/admin/organizations/#{id}/passwordComplexityRules"
+          options[:uri] = "#{service.base_path}/admin/organizations/#{id}/passwordComplexityRules"
           data = service.admin_edit_password_complexity_rules(options).body
           level = Fog::Compute::Ecloud::PasswordComplexityRules.new(:service => service, :href => data[:href])[0]
         end
 
         def edit_login_banner(options = {})
-          options[:uri] = "/cloudapi/ecloud/admin/organizations/#{id}/loginBanner"
+          options[:uri] = "#{service.base_path}/admin/organizations/#{id}/loginBanner"
           data = service.admin_edit_login_banner(options).body
           banner = Fog::Compute::Ecloud::LoginBanners.new(:service => service, :href => data[:href])[0]
         end
 
         def enable_support_access(options = {})
-          options[:uri] = "/cloudapi/ecloud/admin/organizations/#{id}/action/enableSupportAccess"
+          options[:uri] = "#{service.base_path}/admin/organizations/#{id}/action/enableSupportAccess"
           service.admin_enable_support_access(options[:uri])
         end
 
         def disable_support_access(options = {})
-          options[:uri] = "/cloudapi/ecloud/admin/organizations/#{id}/action/disableSupportAccess"
+          options[:uri] = "#{service.base_path}/admin/organizations/#{id}/action/disableSupportAccess"
           service.admin_disable_support_access(options[:uri])
         end
 

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

@@ -33,7 +33,7 @@ module Fog
         end
 
         def create_group(options = {})
-          options[:uri] = "/cloudapi/ecloud/layoutGroups/environments/#{environment_id}/action/createLayoutGroup"
+          options[:uri] = "#{service.base_path}/layoutGroups/environments/#{environment_id}/action/createLayoutGroup"
           options[:row_name] = name
           options[:href] = href
           data = service.groups_create(options).body

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

@@ -26,7 +26,7 @@ module Fog
         end
 
         def create(options = {})
-          options[:uri] = "/cloudapi/ecloud/layoutRows/environments/#{environment_id}/action/createLayoutRow"
+          options[:uri] = "#{service.base_path}/layoutRows/environments/#{environment_id}/action/createLayoutRow"
           data = service.rows_create(options).body
           new(data)
         end

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

@@ -39,11 +39,11 @@ module Fog
         end
 
         def tasks
-          @tasks ||= self.service.tasks(:href => "/cloudapi/ecloud/tasks/virtualMachines/#{id}")
+          @tasks ||= self.service.tasks(:href => "#{service.base_path}/tasks/virtualMachines/#{id}")
         end
 
         def processes
-          @processes ||= Fog::Compute::Ecloud::GuestProcesses.new(:service, service, :href => "/cloudapi/ecloud/virtualMachines/#{id}/guest/processes")
+          @processes ||= Fog::Compute::Ecloud::GuestProcesses.new(:service, service, :href => "#{service.base_path}/virtualMachines/#{id}/guest/processes")
         end
 
         def hardware_configuration=(hardware_configuration)
@@ -51,12 +51,12 @@ module Fog
         end
 
         def hardware_configuration
-          @hardware_configuration ||= self.service.hardware_configurations.new(:href => "/cloudapi/ecloud/virtualMachines/#{id}/hardwareConfiguration")
+          @hardware_configuration ||= self.service.hardware_configurations.new(:href => "#{service.base_path}/virtualMachines/#{id}/hardwareConfiguration")
           @hardware_configuration.reload
         end
 
         def configuration
-          @configuration ||= Fog::Compute::Ecloud::ServerConfigurationOptions.new(:service => service, :href => "/cloudapi/ecloud/virtualMachines/#{id}/configurationOptions")[0]
+          @configuration ||= Fog::Compute::Ecloud::ServerConfigurationOptions.new(:service => service, :href => "#{service.base_path}/virtualMachines/#{id}/configurationOptions")[0]
         end
 
         def ips
@@ -64,7 +64,7 @@ module Fog
         end
 
         def networks
-          @networks ||= self.service.networks(:href => "/cloudapi/ecloud/virtualMachines/#{id}/assignedIps")
+          @networks ||= self.service.networks(:href => "#{service.base_path}/virtualMachines/#{id}/assignedIps")
         end
 
         def power_on
@@ -108,16 +108,16 @@ module Fog
                 options[:ips][index] = ip
               end
             end
-            data = service.virtual_machine_copy("/cloudapi/ecloud/virtualMachines/computePools/#{compute_pool_id}/action/copyVirtualMachine", options).body
+            data = service.virtual_machine_copy("#{service.base_path}/virtualMachines/computePools/#{compute_pool_id}/action/copyVirtualMachine", options).body
           elsif options[:type] == :identical
-            data = service.virtual_machine_copy_identical("/cloudapi/ecloud/virtualMachines/computePools/#{compute_pool_id}/action/copyIdenticalVirtualMachine", options).body
+            data = service.virtual_machine_copy_identical("#{service.base_path}/virtualMachines/computePools/#{compute_pool_id}/action/copyIdenticalVirtualMachine", options).body
           end
           vm = collection.from_data(data)
           vm
         end
 
         def rnats
-          rnats = Fog::Compute::Ecloud::Rnats.new(:service => service, :href => "/cloudapi/ecloud/rnats/environments/#{environment_id}")
+          rnats = Fog::Compute::Ecloud::Rnats.new(:service => service, :href => "#{service.base_path}/rnats/environments/#{environment_id}")
           associations = nil
           rnats.each do |rnat|
             if rnats.index(rnat) == 0
@@ -148,7 +148,7 @@ module Fog
 
         def create_rnat(options)
           options[:host_ip_href] ||= ips.first.href
-          options[:uri] = "/cloudapi/ecloud/rnats/environments/#{environment_id}/action/createAssociation"
+          options[:uri] = "#{service.base_path}/rnats/environments/#{environment_id}/action/createAssociation"
           data = service.rnat_associations_create_device(options).body
           rnat = Fog::Compute::Ecloud::Associations.new(:service => service, :href => data[:href])[0]
         end

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

@@ -14,7 +14,9 @@ module Fog
           data = service.get_templates(href).body[:Families]
           data[:Family].is_a?(Hash) ? data = [data[:Family]] : data = data[:Family]
           data.each do |d|
-            d[:Categories][:Category].each do |cat|
+            cats = d[:Categories][:Category]
+            cats = [cats] if cats.is_a?(Hash)
+            cats.each do |cat|
               cat[:OperatingSystems][:OperatingSystem].is_a?(Hash) ? cat = [cat[:OperatingSystems][:OperatingSystem]] : cat = cat[:OperatingSystems][:OperatingSystem]
               cat.each do |os|
                 os[:Templates][:Template].is_a?(Hash) ? os = [os[:Templates][:Template]] : os = os[:Templates][:Template]

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

@@ -19,11 +19,11 @@ module Fog
         attribute :is_multifactor_authentication_enabled, :aliases => :IsMultifactorAuthenticationEnabled, :type => :boolean
 
         def roles
-          @roles = Fog::Compute::Ecloud::Roles.new(:service => service, :href => "/cloudapi/ecloud/admin/roles/users/#{id}")
+          @roles = Fog::Compute::Ecloud::Roles.new(:service => service, :href => "#{service.base_path}/admin/roles/users/#{id}")
         end
 
         def api_keys
-          @api_keys = Fog::Compute::Ecloud::ApiKeys.new(:service => service, :href => "/cloudapi/ecloud/admin/apiKeys/users/#{id}")
+          @api_keys = Fog::Compute::Ecloud::ApiKeys.new(:service => service, :href => "#{service.base_path}/admin/apiKeys/users/#{id}")
         end
 
         def id

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

@@ -18,7 +18,7 @@ module Fog
           network_id = @network.href.match(/(\d+)$/)[1]
           address_ip = network_address[:IpAddresses][:IpAddress]
           @address = self.service.ip_addresses.new(
-            :href => "/cloudapi/ecloud/ipaddresses/networks/#{network_id}/#{address_ip}",
+            :href => "#{service.base_path}/ipaddresses/networks/#{network_id}/#{address_ip}",
             :name => address_ip
           )
         end

data/lib/fog/ecloud/requests/compute/get_virtual_machine_assigned_ips.rb

@@ -5,7 +5,7 @@ module Fog
       class Real
         def get_virtual_machine_assigned_ips(virtual_machine_id)
           request(
-            :uri => "/cloudapi/ecloud/virtualmachines/#{virtual_machine_id}/assignedips",
+            :uri => "#{base_path}/virtualmachines/#{virtual_machine_id}/assignedips",
             :parse   => true
           )
         end

data/lib/fog/google/models/compute/disk.rb

@@ -84,7 +84,7 @@ module Fog
           self
         end
 
-        def create_snapshot(snap_name, snap_desc)
+        def create_snapshot(snapshot_name, snapshot_description="")
           requires :name
           requires :zone_name
 
@@ -93,18 +93,18 @@ module Fog
           end
 
           options = {
-            'name'        => snap_name,
-            'description' => snap_desc,
+            'name'        => snapshot_name,
+            'description' => snapshot_description,
           }
 
           service.insert_snapshot(name, self.zone, service.project, options)
           data = service.backoff_if_unfound {
-            service.get_snapshot(snap_name, service.project).body
+            service.get_snapshot(snapshot_name, service.project).body
           }
           service.snapshots.merge_attributes(data)
 
           # Try to return the representation of the snapshot we created
-          service.snapshots.get(snap_name)
+          service.snapshots.get(snapshot_name)
         end
 
         RUNNING_STATE = "READY"

data/lib/fog/google/models/compute/disks.rb

@@ -9,8 +9,15 @@ module Fog
 
         model Fog::Compute::Google::Disk
 
-        def all(zone)
-          data = service.list_disks(zone).body["items"] || []
+        def all(filters={})
+          if filters['zone'].nil?
+            data = []
+            service.list_zones.body['items'].each do |zone|
+              data += service.list_disks(zone['name']).body["items"] || []
+            end
+          else
+            data = service.list_disks(filters['zone']).body["items"] || []
+          end
           load(data)
         end
 

data/lib/fog/hp.rb

@@ -1,11 +1,12 @@
 require 'fog/core'
+require 'fog/hp/simple_http_instrumentor'
 
 module Fog
   module HP
 
     # define a specific version for the HP Provider
     unless const_defined?(:VERSION)
-      VERSION = '0.0.20'
+      VERSION = '0.0.22'
     end
 
     extend Fog::Provider
@@ -55,10 +56,14 @@ module Fog
       end
     end
 
+    service(:block_storage, 'hp/block_storage', 'BlockStorage')
+    service(:block_storage_v2, 'hp/block_storage_v2', 'BlockStorageV2')
     service(:cdn,     'hp/cdn',     'CDN')
     service(:compute, 'hp/compute', 'Compute')
+    service(:dns,     'hp/dns',     'DNS')
+    service(:lb,      'hp/lb',      'LB')
+    service(:network, 'hp/network', 'Network')
     service(:storage, 'hp/storage', 'Storage')
-    service(:block_storage, 'hp/block_storage', 'BlockStorage')
 
     # legacy swauth 1.0/1.1 style authentication
     def self.authenticate_v1(options, connection_options = {})
@@ -99,8 +104,43 @@ module Fog
       }
     end
 
+    def self.service_catalog(options, connection_options = {})
+      creds = authenticate_v2(options, connection_options)
+      return {} if creds.nil?
+      return {} if creds[:service_catalog].nil?
+      return creds[:service_catalog]
+    end
+
     # keystone based control services style authentication
     def self.authenticate_v2(options, connection_options = {})
+      unless options[:credentials].nil?
+        expires = true
+        begin
+          expire = DateTime.parse(options[:credentials][:expires])
+          expires = false if expire > DateTime.now
+        rescue
+        end
+        if expires
+          options = options.clone
+          options.delete(:credentials)
+        else
+          service_catalog = options[:credentials][:service_catalog]
+          type  = options[:hp_service_type]
+          zone   = options[:hp_avl_zone]
+          begin
+            creds = options[:credentials].clone
+            creds[:endpoint_url] = get_endpoint_url(service_catalog, type, zone)
+            begin
+              creds[:cdn_endpoint_url] = get_endpoint_url(service_catalog, "CDN", zone)
+            rescue
+            end
+            return creds
+          rescue
+          end
+          options = options.clone
+          options.delete(:credentials)
+        end
+      end
       hp_auth_uri = options[:hp_auth_uri] || "https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0/tokens"
       # append /tokens if missing from auth uri
       @hp_auth_uri = hp_auth_uri.include?('tokens')? hp_auth_uri : hp_auth_uri + "tokens"
@@ -170,18 +210,22 @@ module Fog
 
       ### fish out auth_token and endpoint for the service
       auth_token = body['access']['token']['id']
-      endpoint_url = get_endpoint_from_catalog(body['access']['serviceCatalog'], @hp_service_type, @hp_avl_zone)
-      # If service is Storage, then get the CDN endpoint as well. 'Name' is unique instead of 'Type'
-      if @hp_service_type == "Object Storage"
-        cdn_endpoint_url = get_endpoint_from_catalog(body['access']['serviceCatalog'], "CDN", @hp_avl_zone)
+      expires = body['access']['token']['expires']
+      service_catalog = get_service_catalog(body['access']['serviceCatalog'])
+      endpoint_url = get_endpoint_url(service_catalog, @hp_service_type, @hp_avl_zone)
+      begin
+        cdn_endpoint_url = get_endpoint_url(service_catalog, "CDN", @hp_avl_zone)
+      rescue
       end
 
-      return {
+      creds = {
         :auth_token => auth_token,
+        :expires => expires,
+        :service_catalog => service_catalog,
         :endpoint_url => endpoint_url,
         :cdn_endpoint_url => cdn_endpoint_url
       }
-
+      return creds
     end
 
     # CGI.escape, but without special treatment on spaces
@@ -191,22 +235,50 @@ module Fog
       end
     end
 
+    # converts any attributes hash from aliased keys to original attribute keys
+    def self.convert_aliased_attributes_to_original(model, attributes)
+      original_attributes = {}
+      attributes.each do |k, v|
+        if orig_key = model.aliases.invert[k]
+          original_attributes[orig_key] = v
+        else
+          original_attributes[k] = v
+        end
+      end
+      original_attributes
+    end
+
     private
 
-    def self.get_endpoint_from_catalog(service_catalog, service_type, avl_zone)
-      raise "Unable to parse service catalog." unless service_catalog
-      service_item = service_catalog.detect do |s|
-        # 'Name' is unique instead of 'Type'
-        s["name"] == service_type
+    def self.get_service_catalog(body)
+      raise "Unable to parse service catalog." unless body
+      service_catalog = {}
+      body.each do |s|
+        name = s["name"]
+        next if name.nil?
+        name = name.to_sym
+        next if s['endpoints'].nil?
+        service_catalog[name] = {}
+        s['endpoints'].each do |ep|
+          next if ep['region'].nil?
+          next if ep['publicURL'].nil?
+          next if ep['publicURL'].empty?
+          service_catalog[name][ep['region'].to_sym] = ep['publicURL']
+        end
       end
-      if service_item and service_item['endpoints']
-        endpoint = service_item['endpoints'].detect do |ep|
-          ep['region'] == avl_zone
+      return service_catalog
+    end
+
+    def self.get_endpoint_url(service_catalog, service_type, avl_zone)
+      return nil if service_type.nil?
+      service_type = service_type.to_sym
+      avl_zone = avl_zone.to_sym
+      unless service_catalog[service_type].nil?
+        unless service_catalog[service_type][avl_zone].nil?
+          return service_catalog[service_type][avl_zone]
         end
-        endpoint_url = endpoint['publicURL'] if endpoint
-        raise "Unable to retrieve endpoint service url for availability zone '#{avl_zone}' from service catalog. " if endpoint_url.nil?
-        return endpoint_url
       end
+      raise "Unable to retrieve endpoint service url for availability zone '#{avl_zone}' from service catalog. "
     end
 
     def self.set_user_agent_header(conn_opts, base_str, client_str)
@@ -257,6 +329,23 @@ module Fog
         ip.join('.')
       end
 
+      def self.uuid
+        # pattern of 8-4-4-4-12 hexadecimal digits
+        uuid = []
+        [8,4,4,4,12].each do |x|
+          uuid << Fog::Mock.random_hex(x)
+        end
+        uuid.join('-')
+      end
+
+      def self.mac_address
+        mac_add = []
+        6.times do
+          mac_add << Fog::Mock.random_hex(2)
+        end
+        mac_add.join(':')
+      end
+
     end
 
   end