fog 1.29.0 → 1.30.0

data/lib/fog/dynect/models/dns/records.rb

@@ -14,7 +14,6 @@ module Fog
           data = []
           service.get_all_records(zone.domain, options).body['data'].each do |records|
             (type, list) = records
-            next if %w{soa_records ns_records}.include?(type)
             list.each do |record|
               data << {
                 :identity => record['record_id'],

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

@@ -74,13 +74,11 @@ module Fog
               :disksize       => disksize     || "10",
               :memorysize     => memorysize   || "512",
               :cpucores       => cpucores     || "1",
-              :rootpassword   => rootpassword,
-              :transfer       => transfer     || "500",
-              :bandwidth      => bandwidth    || "10",
+              :rootpassword   => rootpassword
             }
 
             # optional options when creating a server:
-            [:ip, :ipv6, :description].each do |k|
+            [:description, :ip, :ipv6, :transfer, :bandwidth, :campaigncode, :sshkeyids, :sshkey].each do |k|
               options[k] = attributes[k] if attributes[k]
             end
 

data/lib/fog/hp/storage.rb

@@ -158,7 +158,7 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~String> - url for object
         def get_object_https_url(container, object, expires, options = {})
-          create_temp_url(container, object, expires, "GET", options.merge(:scheme => "https"))
+          create_temp_url(container, object, expires, "GET", {:port => 443}.merge(options).merge(:scheme => "https"))
         end
 
         # Get an expiring object http url
@@ -172,7 +172,7 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~String> - url for object
         def get_object_http_url(container, object, expires, options = {})
-          create_temp_url(container, object, expires, "GET", options.merge(:scheme => "http"))
+          create_temp_url(container, object, expires, "GET", {:port => 80}.merge(options).merge(:scheme => "http"))
         end
 
         # Get an object http url expiring in the given amount of seconds
@@ -197,8 +197,10 @@ module Fog
         # * object<~String> - Name of object to get expiring url for
         # * expires<~Time> - An expiry time for this url
         # * method<~String> - The method to use for accessing the object (GET, PUT, HEAD)
-        # * scheme<~String> - The scheme to use (http, https)
         # * options<~Hash> - An optional options hash
+        #   * 'scheme'<~String> - The scheme to use (http, https)
+        #   * 'host'<~String> - The host to use
+        #   * 'port'<~Integer> - The port to use
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -214,6 +216,8 @@ module Fog
 
           expires        = expires.to_i
           scheme = options[:scheme] || @scheme
+          host = options[:host] || @host
+          port = options[:port] || @port
 
           # do not encode before signature generation, encode after
           sig_path = "#{@path}/#{container}/#{object}"
@@ -226,7 +230,7 @@ module Fog
           # HP uses a different strategy to create the signature that is passed to swift than OpenStack.
           # As the HP provider is broadly used by OpenStack users the OpenStack strategy is applied when
           # the @os_account_meta_temp_url_key is given.
-          if @os_account_meta_temp_url_key then
+          if @os_account_meta_temp_url_key
             hmac      = OpenSSL::HMAC.new(@os_account_meta_temp_url_key, OpenSSL::Digest::SHA1.new)
             signature= hmac.update(string_to_sign).hexdigest
           else
@@ -247,7 +251,14 @@ module Fog
           end
 
           # generate the temp url using the signature and expiry
-          "#{scheme}://#{@host}#{encoded_path}?temp_url_sig=#{signature}&temp_url_expires=#{expires}"
+          temp_url_options = {
+              :scheme => scheme,
+              :host => host,
+              :port => port,
+              :path => encoded_path,
+              :query => "temp_url_sig=#{signature}&temp_url_expires=#{expires}"
+          }
+          URI::Generic.build(temp_url_options).to_s
         end
       end
 
@@ -286,6 +297,15 @@ module Fog
           @hp_secret_key = options[:hp_secret_key]
           @hp_tenant_id = options[:hp_tenant_id]
           @os_account_meta_temp_url_key = options[:os_account_meta_temp_url_key]
+
+          @hp_storage_uri = options[:hp_auth_uri]
+
+          uri = URI.parse(@hp_storage_uri)
+          @host   = uri.host
+          @path   = uri.path
+          @persistent = options[:persistent] || false
+          @port   = uri.port
+          @scheme = uri.scheme
         end
 
         def data

data/lib/fog/linode/requests/compute/avail_datacenters.rb

@@ -29,7 +29,8 @@ module Fog
               { "LOCATION" => "Atlanta, GA, USA",    "DATACENTERID" => 4 },
               { "LOCATION" => "Newark, NJ, USA",     "DATACENTERID" => 6 },
               { "LOCATION" => "London, England, UK", "DATACENTERID" => 7 },
-              { "LOCATION" => "Tokyo, JP",           "DATACENTERID" => 8 }
+              { "LOCATION" => "Tokyo, JP",           "DATACENTERID" => 8 },
+              { "LOCATION" => "Singapore, SGP",      "DATACENTERID" => 9 },
             ],
             "ACTION" => "avail.datacenters"
           }

data/lib/fog/opennebula/compute.rb

@@ -28,6 +28,9 @@ module Fog
       request :vm_resume
       request :vm_stop
       request :template_pool
+      request :vm_disk_snapshot
+      request :vm_shutdown
+      request :image_pool
 
     class Mock
       include Collections

data/lib/fog/opennebula/models/compute/flavor.rb

@@ -51,18 +51,22 @@ module Fog
         end  
 
         def get_vcpu
-          return "VCPU=1\n" unless vcpu
+          self.vcpu = 1 unless vcpu
           "VCPU=#{vcpu}\n"
         end  
 
         def get_memory
-          return "MEMORY=128\n" unless memory
+          self.memory = 128 unless memory
           "MEMORY=#{memory}\n"
         end  
 
         def get_raw
           return "" unless raw
-          "RAW=#{raw}\n"
+          ret = "RAW=#{raw}\n"
+          ret.gsub!(/\{/, '[')
+          ret.gsub!(/\}/, ']')
+          ret.gsub!(/>/,'')
+          ret
         end
 
         def get_disk
@@ -116,22 +120,22 @@ module Fog
 
         def get_sched_ds_requirements
           return "" unless sched_ds_requirements 
-          %Q|SCHED_DS_REQUIREMENTS="#{sched_ds_requirements}"\n|
+          %Q|SCHED_DS_REQUIREMENTS="#{sched_ds_requirements.gsub(/"/){ %q(\") }}"\n|
         end
 
         def get_sched_ds_rank
           return "" unless sched_ds_rank 
-          %Q|SCHED_DS_RANK="#{sched_ds_rank}"\n|
+          %Q|SCHED_DS_RANK="#{sched_ds_rank.gsub(/"/){ %q(\") }}"\n|
         end
 
         def get_sched_requirements
           return "" unless sched_requirements 
-          %Q|SCHED_REQUIREMENTS="#{sched_requirements}"\n|
+          %Q|SCHED_REQUIREMENTS="#{sched_requirements.gsub(/"/){ %q(\") }}"\n|
         end
 
         def get_sched_rank
           return "" unless sched_rank 
-          %Q|SCHED_RANK="#{sched_rank}"\n|
+          %Q|SCHED_RANK="#{sched_rank.gsub(/"/){ %q(\") }}"\n|
         end
 
         def get_context

data/lib/fog/opennebula/models/compute/networks.rb

@@ -12,7 +12,17 @@ module Fog
         end
 
         def get(id)
-          self.all({:id => id}).first
+          data = service.list_networks({:id => id})
+          load(data).first
+        rescue Fog::Compute::OpenNebula::NotFound
+          nil
+        end
+
+        def get_by_name(network)
+          data = service.list_networks({:network => network})
+          load(data).first
+        rescue Fog::Compute::OpenNebula::NotFound
+          nil
         end
 
         def get_by_filter(filter)

data/lib/fog/opennebula/models/compute/servers.rb

@@ -19,6 +19,10 @@ module Fog
           new data.first unless data.empty?
         end
 
+        def shutdown(id)
+          service.vm_shutdown(id)
+        end
+
       end
     end
   end

data/lib/fog/opennebula/requests/compute/image_pool.rb

@@ -0,0 +1,27 @@
+module Fog
+  module Compute
+    class OpenNebula
+      class Real
+        def image_pool(filter = { })
+
+          images = ::OpenNebula::ImagePool.new(client)
+          if filter[:mine].nil?
+            images.info!
+          else
+            images.info_mine!
+          end # if filter[:mine].nil?
+
+          if not filter[:id].nil?
+            images.each do |i|
+              if filter[:id] == i.id
+                return [ i ] # return an array with only one element - found image
+              end
+            end
+          end
+          images.delete nil
+          images
+        end #def image_pool
+      end #class Real
+    end #class OpenNebula
+  end #module Compute
+end #module Fog

data/lib/fog/opennebula/requests/compute/list_networks.rb

@@ -50,7 +50,7 @@ module Fog
 
       class Mock
         def list_networks(filters={})
-          net1 = mock_network 'net1'
+          net1 = mock_network 'fogtest'
           net2 = mock_network 'net2'
           [net1, net2]
         end

data/lib/fog/opennebula/requests/compute/template_pool.rb

@@ -63,9 +63,14 @@ module Fog
             h["NIC"] = [] # reset nics to a array
             if nics.is_a? Array
               nics.each do |n|
-                n["model"] = "virtio" if n["model"].nil?
-                n["uuid"] = "0" if n["uuid"].nil? # is it better is to remove this NIC?
-                h["NIC"] << interfaces.new({ :vnet => networks.get(n["uuid"]), :model => n["model"]})
+                if n["NETWORK_ID"]
+                  vnet = networks.get(n["NETWORK_ID"].to_s)
+                elsif n["NETWORK"]
+                  vnet = networks.get_by_name(n["NETWORK"].to_s)
+                else 
+                  next
+                end
+                h["NIC"] << interfaces.new({ :vnet => vnet, :model => n["MODEL"] || "virtio" })
               end
             elsif nics.is_a? Hash
               nics["model"] = "virtio" if nics["model"].nil?
@@ -82,7 +87,6 @@ module Fog
             else
               # should i break?
             end
-
           
             # every key should be lowercase
             ret_hash = {}
@@ -100,6 +104,9 @@ module Fog
 
       class Mock
         def template_pool(filter = { })
+          nic1 = Mock_nic.new
+          nic1.vnet = networks.first
+
           [ 
             {
               :content => %Q{
@@ -119,6 +126,7 @@ module Fog
               :sched_ds_rank => "FREE_MB",
               :disk => {},
               :nic => {},
+              :nic => [ nic1 ] ,
               :os => {
                 'ARCH' => 'x86_64'
               },
@@ -129,6 +137,17 @@ module Fog
             }
           ]
         end
+
+        class Mock_nic 
+          attr_accessor :vnet
+
+          def id
+            2
+          end
+          def name
+            "fogtest"
+          end
+        end
       end #class Mock
     end #class OpenNebula
   end #module Compute

data/lib/fog/opennebula/requests/compute/vm_disk_snapshot.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Compute
+    class OpenNebula
+      class Real
+
+        def vm_disk_snapshot(id, disk_id, image_name)
+          vmpool = ::OpenNebula::VirtualMachinePool.new(client)
+          vmpool.info!(-2,id,id,-1)
+
+          rc = 0
+          vmpool.each do |vm|
+            rc = vm.disk_snapshot(disk_id, image_name)
+            if(rc.is_a? ::OpenNebula::Error)
+               raise(rc)
+            end
+          end
+          rc
+        end #def vm_disk_snapshot
+      end
+    end
+  end
+end

data/lib/fog/opennebula/requests/compute/vm_shutdown.rb

@@ -0,0 +1,18 @@
+module Fog
+  module Compute
+    class OpenNebula
+      class Real
+
+        def vm_shutdown(id)
+          vmpool = ::OpenNebula::VirtualMachinePool.new(client)
+          vmpool.info!(-2,id,id,-1)
+
+          vmpool.each do |vm|
+            vm.shutdown()
+          end
+        end #def vm_shutdown
+
+      end
+    end
+  end
+end

data/lib/fog/openstack/compute.rb

@@ -6,10 +6,11 @@ module Fog
       requires :openstack_auth_url
       recognizes :openstack_auth_token, :openstack_management_url,
                  :persistent, :openstack_service_type, :openstack_service_name,
-                 :openstack_tenant,
+                 :openstack_tenant, :openstack_tenant_id,
                  :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
                  :current_user, :current_tenant, :openstack_region,
-                 :openstack_endpoint_type
+                 :openstack_endpoint_type,
+                 :openstack_project_domain, :openstack_user_domain
 
       ## MODELS
       #
@@ -250,10 +251,12 @@ module Fog
 
         def initialize(options={})
           @openstack_username = options[:openstack_username]
-          @openstack_domain = options[:openstack_domain]
+          @openstack_user_domain = options[:openstack_user_domain] || options[:openstack_domain]
+          @openstack_project_domain  = options[:openstack_project_domain]  || options[:openstack_domain] || 'Default'
           @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
 
           @current_tenant = options[:openstack_tenant]
+          @current_tenant_id = options[:openstack_tenant_id]
 
           @auth_token = Fog::Mock.random_base64(64)
           @auth_token_expiration = (Time.now.utc + 86400).iso8601
@@ -290,7 +293,9 @@ module Fog
         attr_reader :auth_token_expiration
         attr_reader :current_user
         attr_reader :current_tenant
-        attr_reader :openstack_domain
+        attr_reader :current_tenant_id
+        attr_reader :openstack_user_domain
+        attr_reader :openstack_project_domain
 
         def initialize(options={})
           @openstack_auth_token = options[:openstack_auth_token]
@@ -299,25 +304,28 @@ module Fog
 
           unless @auth_token
             missing_credentials = Array.new
-            @openstack_api_key  = options[:openstack_api_key]
-            @openstack_username = options[:openstack_username]
-            @openstack_domain   = options[:openstack_domain]
+            @openstack_api_key     = options[:openstack_api_key]
+            @openstack_username    = options[:openstack_username]
+            @openstack_user_domain = options[:openstack_user_domain] || options[:openstack_domain]
+            @openstack_project_domain  = options[:openstack_project_domain]  || options[:openstack_domain] || 'Default'
 
             missing_credentials << :openstack_api_key  unless @openstack_api_key
             missing_credentials << :openstack_username unless @openstack_username
             raise ArgumentError, "Missing required arguments: #{missing_credentials.join(', ')}" unless missing_credentials.empty?
           end
 
-          @openstack_tenant     = options[:openstack_tenant]
-          @openstack_domain     = options[:openstack_domain] || 'Default'
-          @openstack_auth_uri   = URI.parse(options[:openstack_auth_url])
+          @openstack_tenant      = options[:openstack_tenant]
+          @openstack_tenant_id   = options[:openstack_tenant_id]
+          @openstack_user_domain = options[:openstack_user_domain] || options[:openstack_domain]
+          @openstack_project_domain  = options[:openstack_project_domain]  || options[:openstack_domain] || 'Default'
+          @openstack_auth_uri    = URI.parse(options[:openstack_auth_url])
           @openstack_management_url       = options[:openstack_management_url]
           @openstack_must_reauthenticate  = false
-          @openstack_service_type = options[:openstack_service_type] || ['nova', 'compute']
-          @openstack_service_name = options[:openstack_service_name]
+          @openstack_service_type  = options[:openstack_service_type] || ['nova', 'compute']
+          @openstack_service_name  = options[:openstack_service_name]
           @openstack_identity_service_type = options[:openstack_identity_service_type] || 'identity'
           @openstack_endpoint_type = options[:openstack_endpoint_type] || 'publicURL'
-          @openstack_region      = options[:openstack_region]
+          @openstack_region        = options[:openstack_region]
 
           @connection_options = options[:connection_options] || {}
 
@@ -332,7 +340,8 @@ module Fog
 
         def credentials
           { :provider                 => 'openstack',
-            :openstack_domain         => @openstack_domain,
+            :openstack_user_domain    => @openstack_user_domain,
+            :openstack_project_domain     => @openstack_project_domain,
             :openstack_auth_url       => @openstack_auth_uri.to_s,
             :openstack_auth_token     => @auth_token,
             :openstack_management_url => @openstack_management_url,
@@ -386,13 +395,15 @@ module Fog
         def authenticate
           if !@openstack_management_url || @openstack_must_reauthenticate
             options = {
-              :openstack_api_key    => @openstack_api_key,
-              :openstack_username   => @openstack_username,
-              :openstack_domain     => @openstack_domain,
-              :openstack_auth_token => @openstack_must_reauthenticate ? nil : @auth_token,
-              :openstack_auth_uri   => @openstack_auth_uri,
-              :openstack_region     => @openstack_region,
-              :openstack_tenant     => @openstack_tenant,
+              :openstack_api_key      => @openstack_api_key,
+              :openstack_username     => @openstack_username,
+              :openstack_user_domain  => @openstack_user_domain,
+              :openstack_project_domain   => @openstack_project_domain,
+              :openstack_auth_token   => @openstack_must_reauthenticate ? nil : @auth_token,
+              :openstack_auth_uri     => @openstack_auth_uri,
+              :openstack_region       => @openstack_region,
+              :openstack_tenant       => @openstack_tenant,
+              :openstack_tenant_id    => @openstack_tenant_id,
               :openstack_service_type => @openstack_service_type,
               :openstack_service_name => @openstack_service_name,
               :openstack_identity_service_type => @openstack_identity_service_type,
@@ -400,7 +411,6 @@ module Fog
             }
 
             if @openstack_auth_uri.path =~ /\/v2.0/
-
               credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)
             elsif @openstack_auth_uri.path =~ /\/v3/
               credentials = Fog::OpenStack.authenticate_v3(options, @connection_options)
@@ -423,9 +433,9 @@ module Fog
           @path, @tenant_id = uri.path.scan(/(\/.*)\/(.*)/).flatten
 
           @path.sub!(/\/$/, '')
-          unless @path.match(/1\.1|v2|v3/)
+          unless @path.match(/1\.1|v2/)
             raise Fog::OpenStack::Errors::ServiceUnavailable.new(
-                    "OpenStack binding only supports version 2 (a.k.a. 1.1)")
+                    "OpenStack compute binding only supports version 2 (a.k.a. 1.1)")
           end
 
           @port   = uri.port