fog 1.10.1 → 1.11.0

data/lib/fog/rackspace/requests/storage/get_object_https_url.rb

@@ -14,10 +14,10 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~String> - url for object
-        # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404
-        # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400
-        # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500
-        # @raise [Fog::Rackspace::Errors::ServiceError]
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
         # ==== See Also
         # http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_TempURL-d1a444.html
         def get_object_https_url(container, object, expires, options = {})

data/lib/fog/rackspace/requests/storage/head_container.rb

@@ -13,10 +13,10 @@ module Fog
         #   * headers<~Hash>:
         #     * 'X-Container-Object-Count'<~String> - Count of containers
         #     * 'X-Container-Bytes-Used'<~String>   - Bytes used
-        # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404
-        # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400
-        # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500
-        # @raise [Fog::Rackspace::Errors::ServiceError]
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
         def head_container(container)
           request(
             :expects  => 204,

data/lib/fog/rackspace/requests/storage/head_containers.rb

@@ -10,10 +10,10 @@ module Fog
         #   * headers<~Hash>:
         #     * 'X-Account-Container-Count'<~String> - Count of containers
         #     * 'X-Account-Bytes-Used'<~String> - Bytes used
-        # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404
-        # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400
-        # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500
-        # @raise [Fog::Rackspace::Errors::ServiceError]
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
         def head_containers
           request(
             :expects  => 204,

data/lib/fog/rackspace/requests/storage/head_object.rb

@@ -8,10 +8,10 @@ module Fog
         # ==== Parameters
         # * container<~String> - Name of container to look in
         # * object<~String> - Name of object to look for
-        # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404
-        # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400
-        # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500
-        # @raise [Fog::Rackspace::Errors::ServiceError]
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
         def head_object(container, object)
           request({
             :expects  => 200,

data/lib/fog/rackspace/requests/storage/post_set_meta_temp_url_key.rb

@@ -19,10 +19,10 @@ module Fog
         #
         # ==== Returns
         # * response<~Excon::Response>
-        # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404
-        # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400
-        # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500
-        # @raise [Fog::Rackspace::Errors::ServiceError]
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
         # ==== See Also
         # http://docs.rackspace.com/files/api/v1/cf-devguide/content/Set_Account_Metadata-d1a4460.html
         def post_set_meta_temp_url_key(key)

data/lib/fog/rackspace/requests/storage/put_container.rb

@@ -7,10 +7,10 @@ module Fog
         #
         # ==== Parameters
         # * name<~String> - Name for container, should be < 256 bytes and must not contain '/'
-        # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404
-        # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400
-        # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500
-        # @raise [Fog::Rackspace::Errors::ServiceError]
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
         def put_container(name, options={})
           request(
             :expects  => [201, 202],

data/lib/fog/rackspace/requests/storage/put_object.rb

@@ -10,10 +10,10 @@ module Fog
         # * object<~String> - Name for object
         # * data<~String|File> - data to upload
         # * options<~Hash> - config headers for object. Defaults to {}.
-        # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404
-        # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400
-        # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500
-        # @raise [Fog::Rackspace::Errors::ServiceError]
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
         def put_object(container, object, data, options = {})
           data = Fog::Storage.parse_data(data)
           headers = data[:headers].merge!(options)

data/lib/fog/rackspace/requests/storage/put_object_manifest.rb

@@ -8,10 +8,10 @@ module Fog
         # ==== Parameters
         # * container<~String> - Name for container, should be < 256 bytes and must not contain '/'
         # * object<~String> - Name for object
-        # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404
-        # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400
-        # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500
-        # @raise [Fog::Rackspace::Errors::ServiceError]
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
         def put_object_manifest(container, object)
           path = "#{Fog::Rackspace.escape(container)}/#{Fog::Rackspace.escape(object)}"
           request(

data/lib/fog/rackspace/service.rb

@@ -28,7 +28,7 @@ module Fog
 
       def authenticate(options)
          self.send authentication_method, options
-       end
+      end
 
       private
 

data/lib/fog/rackspace/storage.rb

@@ -4,6 +4,11 @@ require 'fog/storage'
 module Fog
   module Storage
     class Rackspace < Fog::Service
+      include Fog::Rackspace::Errors
+
+      class ServiceError < Fog::Rackspace::Errors::ServiceError; end
+      class InternalServerError < Fog::Rackspace::Errors::InternalServerError; end
+      class BadRequest < Fog::Rackspace::Errors::BadRequest; end
 
       requires :rackspace_api_key, :rackspace_username
       recognizes :rackspace_auth_url, :rackspace_servicenet, :rackspace_cdn_ssl, :persistent, :rackspace_region
@@ -152,13 +157,14 @@ module Fog
             else # bad credentials
               raise error
             end
+          rescue Excon::Errors::NotFound => error
+            raise NotFound.slurp(error, region)
+          rescue Excon::Errors::BadRequest => error
+            raise BadRequest.slurp error
+          rescue Excon::Errors::InternalServerError => error
+            raise InternalServerError.slurp error
           rescue Excon::Errors::HTTPStatusError => error
-            raise case error
-            when Excon::Errors::NotFound
-              Fog::Storage::Rackspace::NotFound.slurp(error)
-            else
-              error
-            end
+            raise ServiceError.slurp error
           end
           if !response.body.empty? && parse_json && response.headers['Content-Type'] =~ %r{application/json}
             response.body = Fog::JSON.decode(response.body)

data/lib/fog/riakcs.rb

@@ -71,9 +71,9 @@ module Fog
 
     module UserUtils
       def update_riakcs_user(key_id, user)
-        response = @s3_connection.put_object('riak-cs', "user/#{key_id}", MultiJson.encode(user), { 'Content-Type' => 'application/json' })
+        response = @s3_connection.put_object('riak-cs', "user/#{key_id}", Fog::JSON.encode(user), { 'Content-Type' => 'application/json' })
         if !response.body.empty?
-          response.body = MultiJson.decode(response.body)
+          response.body = Fog::JSON.decode(response.body)
         end
         response
       end
@@ -84,7 +84,7 @@ module Fog
             data[key_id][:status] = status
           end
 
-          if regrant = user[:new_key_secret]
+          if user[:new_key_secret]
             data[key_id][:key_secret] = rand(100).to_s
           end
 

data/lib/fog/riakcs/provisioning.rb

@@ -48,8 +48,6 @@ module Fog
 
         def initialize(options = {})
           require 'mime/types'
-          require 'multi_json'
-
           configure_uri_options(options)
           @riakcs_access_key_id     = options[:riakcs_access_key_id]
           @riakcs_secret_access_key = options[:riakcs_secret_access_key]
@@ -89,7 +87,7 @@ module Fog
             end
           end
           if !response.body.empty? && parse_response
-            response.body = MultiJson.decode(response.body)
+            response.body = Fog::JSON.decode(response.body)
           end
           response
         end

data/lib/fog/riakcs/requests/provisioning/create_user.rb

@@ -3,7 +3,7 @@ module Fog
     class Provisioning
       class Real
         def create_user(email, name, options = {})
-          payload = MultiJson.encode({ :email => email, :name => name })
+          payload = Fog::JSON.encode({ :email => email, :name => name })
           headers = { 'Content-Type' => 'application/json' }
 
           if(options[:anonymous])
@@ -20,7 +20,7 @@ module Fog
               if !response.body.empty?
                 case response.headers['Content-Type']
                 when 'application/json'
-                  response.body = MultiJson.decode(response.body)
+                  response.body = Fog::JSON.decode(response.body)
                 end
               end
               response

data/lib/fog/riakcs/requests/provisioning/get_user.rb

@@ -7,7 +7,7 @@ module Fog
 
         def get_user(key_id)
           response = @s3_connection.get_object('riak-cs', "user/#{key_id}", { 'Accept' => 'application/json' })
-          response.body = MultiJson.decode(response.body)
+          response.body = Fog::JSON.decode(response.body)
           response
         end
       end

data/lib/fog/riakcs/requests/provisioning/list_users.rb

@@ -10,7 +10,7 @@ module Fog
 
           boundary      = extract_boundary(response.headers['Content-Type'])
           parts         = parse(response.body, boundary)
-          decoded       = parts.map { |part| MultiJson.decode(part[:body]) }
+          decoded       = parts.map { |part| Fog::JSON.decode(part[:body]) }
 
           response.body = decoded.flatten
 

data/lib/fog/riakcs/requests/usage/get_usage.rb

@@ -37,7 +37,7 @@ module Fog
           response = @connection.get_object('riak-cs', ["usage", request_uri(access_key_id, options)].join("/"))
 
           if !response.body.empty?
-            response.body = MultiJson.decode(response.body)
+            response.body = Fog::JSON.decode(response.body)
           end
           response
         end

data/lib/fog/riakcs/usage.rb

@@ -42,7 +42,6 @@ module Fog
 
         def initialize(options = {})
           require 'mime/types'
-          require 'multi_json'
 
           configure_uri_options(options)
           @riakcs_access_key_id     = options[:riakcs_access_key_id]

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.10.1'
+  VERSION = '1.11.0'
 end

data/lib/fog/vsphere/compute.rb

@@ -49,6 +49,8 @@ module Fog
       request :get_network
       request :list_datastores
       request :get_datastore
+      request :list_templates
+      request :get_template
       request :get_folder
       request :list_folders
       request :create_vm
@@ -74,6 +76,8 @@ module Fog
           :id => 'config.instanceUuid',
           :name => 'name',
           :uuid => 'config.uuid',
+          :template => 'config.template',
+          :parent => 'parent',
           :hostname => 'summary.guest.hostName',
           :operatingsystem => 'summary.guest.guestFullName',
           :ipaddress => 'guest.ipAddress',
@@ -88,6 +92,11 @@ module Fog
           :guest_id => 'summary.guest.guestId',
         }
 
+        def convert_vm_view_to_attr_hash(vms)
+          vms = @connection.serviceContent.propertyCollector.collectMultiple(vms,*ATTR_TO_PROP.values.uniq)
+          vms.map { |vm| props_to_attr_hash(*vm) }
+        end
+
         # Utility method to convert a VMware managed object into an attribute hash.
         # This should only really be necessary for the real class.
         # This method is expected to be called by the request methods
@@ -96,6 +105,10 @@ module Fog
           return nil unless vm_mob_ref
 
           props = vm_mob_ref.collect!(*ATTR_TO_PROP.values.uniq)
+          props_to_attr_hash vm_mob_ref, props
+        end
+
+        def props_to_attr_hash vm_mob_ref, props
           # NOTE: Object.tap is in 1.8.7 and later.
           # Here we create the hash object that this method returns, but first we need
           # to add a few more attributes that require additional calls to the vSphere
@@ -110,26 +123,20 @@ module Fog
             # The name method "magically" appears after a VM is ready and
             # finished cloning.
             if attrs['hypervisor'].kind_of?(RbVmomi::VIM::HostSystem)
-              begin
-                host = attrs['hypervisor']
-                attrs['datacenter'] = parent_attribute(host.path, :datacenter)[1]
-                attrs['cluster']    = parent_attribute(host.path, :cluster)[1]
-                attrs['hypervisor'] = host.name
-                attrs['resource_pool'] = (vm_mob_ref.resourcePool || host.resourcePool).name rescue nil
-              rescue
-                # If it's not ready, set the hypervisor to nil
-                attrs['hypervisor'] = nil
-              end
+              host = attrs['hypervisor']
+              attrs['datacenter'] = Proc.new { parent_attribute(host.path, :datacenter)[1] rescue nil }
+              attrs['cluster']    = Proc.new { parent_attribute(host.path, :cluster)[1] rescue nil }
+              attrs['hypervisor'] = Proc.new { host.name rescue nil }
+              attrs['resource_pool'] = Proc.new {(vm_mob_ref.resourcePool || host.resourcePool).name rescue nil}
             end
             # This inline rescue catches any standard error.  While a VM is
             # cloning, a call to the macs method will throw and NoMethodError
-            attrs['mac_addresses'] = vm_mob_ref.macs rescue nil
-            # Rescue nil to catch testing while vm_mob_ref isn't reaL?? 
-            attrs['path'] = "/"+vm_mob_ref.parent.path.map(&:last).join('/') rescue nil
+            attrs['mac_addresses'] = Proc.new {vm_mob_ref.macs rescue nil}
+            # Rescue nil to catch testing while vm_mob_ref isn't reaL??
+            attrs['path'] = "/"+attrs['parent'].path.map(&:last).join('/') rescue nil
             attrs['relative_path'] = (attrs['path'].split('/').reject {|e| e.empty?} - ["Datacenters", attrs['datacenter'], "vm"]).join("/") rescue nil
           end
         end
-
         # returns the parent object based on a type
         # provides both real RbVmomi object and its name.
         # e.g.

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

@@ -11,14 +11,14 @@ module Fog
         attr_accessor :datacenter
 
         def all(filters = {})
-          load service.list_networks(filters.merge(:datacenter => datacenter))
+          f = { :datacenter => datacenter }.merge(filters)
+          load service.list_networks(f)
         end
 
         def get(id)
           requires :datacenter
           new service.get_network(id, datacenter)
         end
-
       end
     end
   end

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

@@ -52,6 +52,16 @@ module Fog
           initialize_volumes
         end
 
+        # Lazy Loaded Attributes
+        [:datacenter, :cluster, :hypervisor, :resource_pool, :mac_addresses].each do |attr|
+          define_method attr do
+            attributes[attr] = attributes[attr].call if attributes[attr].is_a?(Proc)
+            attributes[attr]
+          end
+        end
+        # End Lazy Loaded Attributes
+
+
         def vm_reconfig_memory(options = {})
           requires :instance_uuid, :memory
           service.vm_reconfig_memory('instance_uuid' => instance_uuid, 'memory' => memory)

data/lib/fog/vsphere/requests/compute/get_resource_pool.rb

@@ -11,7 +11,7 @@ module Fog
         protected
 
         def get_raw_resource_pool(name, cluster_name, datacenter_name)
-          dc      = get_raw_datacenter(datacenter_name)
+          dc      = find_raw_datacenter(datacenter_name)
           cluster = dc.find_compute_resource(cluster_name)
           cluster.resourcePool.find name
         end

data/lib/fog/vsphere/requests/compute/get_template.rb

@@ -0,0 +1,16 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def get_template(id, datacenter_name = nil)
+          convert_vm_mob_ref_to_attr_hash(get_vm_ref(id, datacenter_name))
+        end
+      end
+
+      class Mock
+        def get_template(id, datacenter_name = nil)
+        end
+      end
+    end
+  end
+end

data/lib/fog/vsphere/requests/compute/list_datacenters.rb

@@ -20,7 +20,7 @@ module Fog
         end
 
         def find_datacenters name=nil
-          name ? [get_raw_datacenter(name)] : raw_datacenters
+          name ? [find_raw_datacenter(name)] : raw_datacenters
         end
       end
 

data/lib/fog/vsphere/requests/compute/list_templates.rb

@@ -0,0 +1,49 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def list_templates(options = { })
+          options[:folder] ||= options['folder']
+          if options[:folder] then
+            list_all_templates_in_folder(options[:folder], options[:datacenter])
+          else
+            list_all_templates(options)
+          end
+        end
+
+        private
+
+        def list_all_templates_in_folder(path, datacenter_name)
+          folder = get_raw_vmfolder(path, datacenter_name)
+
+          vms = folder.children.grep(RbVmomi::VIM::VirtualMachine)
+          # remove all virtual machines that are not template
+          vms.delete_if { |v| v.config.nil? or not v.config.template }
+
+          vms.map(&method(:convert_vm_mob_ref_to_attr_hash))
+        end
+
+        def list_all_templates(options = {})
+          datacenters = find_datacenters(options[:datacenter])
+
+          vms = datacenters.map do |dc|
+            @connection.serviceContent.viewManager.CreateContainerView({
+              :container  => dc.vmFolder,
+              :type       =>  ["VirtualMachine"],
+              :recursive  => true
+            }).view
+          end.flatten
+          # remove all virtual machines that are not templates
+          vms.delete_if { |v| v.config.nil? or not v.config.template }
+
+          vms.map(&method(:convert_vm_mob_ref_to_attr_hash))
+        end
+
+      end
+      class Mock
+        def list_templates(filters = { })
+        end
+      end
+    end
+  end
+end