fog 1.6.0 → 1.7.0

data/lib/fog/openstack/volume.rb

@@ -48,6 +48,16 @@ module Fog
         def initialize(options={})
           require 'multi_json'
           @openstack_username = options[:openstack_username]
+          @openstack_tenant   = options[:openstack_tenant]
+          @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
+
+          @auth_token = Fog::Mock.random_base64(64)
+          @auth_token_expiration = (Time.now.utc + 86400).iso8601
+
+          management_url = URI.parse(options[:openstack_auth_url])
+          management_url.port = 8776
+          management_url.path = '/v1'
+          @openstack_management_url = management_url.to_s
 
           @data ||= { :users => {} }
           unless @data[:users].find {|u| u['name'] == options[:openstack_username]}

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

@@ -19,7 +19,6 @@ module Fog
         attribute :state,       :aliases => 'status'
 
         attr_reader :password
-        attr_writer :private_key, :private_key_path, :public_key, :public_key_path, :username
 
         def initialize(attributes={})
           self.flavor_id  ||= 1  # 256 server
@@ -49,31 +48,13 @@ module Fog
         end
 
         def private_ip_address
-          nil
-        end
-
-        def private_key_path
-          @private_key_path ||= Fog.credentials[:private_key_path]
-          @private_key_path &&= File.expand_path(@private_key_path)
-        end
-
-        def private_key
-          @private_key ||= private_key_path && File.read(private_key_path)
+          addresses['private'].first
         end
 
         def public_ip_address
           addresses['public'].first
         end
 
-        def public_key_path
-          @public_key_path ||= Fog.credentials[:public_key_path]
-          @public_key_path &&= File.expand_path(@public_key_path)
-        end
-
-        def public_key
-          @public_key ||= public_key_path && File.read(public_key_path)
-        end
-
         def ready?
           self.state == 'ACTIVE'
         end
@@ -112,10 +93,6 @@ module Fog
           retry
         end
 
-        def username
-          @username ||= 'root'
-        end
-
         private
 
         def adminPass=(new_admin_pass)

data/lib/fog/rackspace/models/compute_v2/server.rb

@@ -40,7 +40,7 @@ module Fog
         attribute :addresses
         attribute :flavor_id, :aliases => 'flavor', :squash => 'id'
         attribute :image_id, :aliases => 'image', :squash => 'id'
-
+        
         attr_reader :password
 
         def save
@@ -54,7 +54,9 @@ module Fog
 
         def create
           requires :name, :image_id, :flavor_id
-          data = connection.create_server(name, image_id, flavor_id, 1, 1)
+          options = {}
+          options[:disk_config] = disk_config unless disk_config.nil?
+          data = connection.create_server(name, image_id, flavor_id, 1, 1, options)
           merge_attributes(data.body['server'])
           true
         end

data/lib/fog/rackspace/requests/compute_v2/create_server.rb

@@ -13,7 +13,7 @@ module Fog
             }
           }
 
-          data['server']['diskConfig'] = options[:disk_config] unless options[:disk_config].nil?
+          data['server']['OS-DCF:diskConfig'] = options[:disk_config] unless options[:disk_config].nil?
 
           request(
             :body => Fog::JSON.encode(data),

data/lib/fog/rackspace/requests/compute_v2/list_servers.rb

@@ -6,7 +6,7 @@ module Fog
           request(
             :expects => [200, 203, 300],
             :method => 'GET',
-            :path => 'servers'
+            :path => 'servers/detail'
           )
         end
       end

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

@@ -26,7 +26,7 @@ module Fog
         attribute :zone
         attribute :active
 
-        attr_writer :password, :username
+        attr_writer :password
 
         def initialize(attributes={})
           super
@@ -53,10 +53,6 @@ module Fog
           true
         end
 
-        def username
-          @username ||= 'root'
-        end
-
         def clone(options)
           requires :identity
           connection.clone_server({:uniq_id => identity}.merge!(options))

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

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/compute/models/server'
 
 module Fog
   module Compute
     class VirtualBox
 
-      class Server < Fog::Model
+      class Server < Fog::Compute::Server
 
         identity :id
 
@@ -69,8 +69,6 @@ module Fog
         # property :usb_controller, :USBController, :readonly => true
         # property :vrde_server, :VRDEServer, :readonly => true
 
-        attr_writer :private_key, :private_key_path, :public_key, :public_key_path, :username
-
         def initialize(attributes={})
           self.memory_size = 256
           self.rtc_use_utc = true
@@ -102,28 +100,10 @@ module Fog
           nil
         end
 
-        def private_key_path
-          @private_key_path ||= Fog.credentials[:private_key_path]
-          @private_key_path &&= File.expand_path(@private_key_path)
-        end
-
-        def private_key
-          @private_key ||= private_key_path && File.read(private_key_path)
-        end
-
         def public_ip_address
           nil
         end
 
-        def public_key_path
-          @public_key_path ||= Fog.credentials[:public_key_path]
-          @public_key_path &&= File.expand_path(@public_key_path)
-        end
-
-        def public_key
-          @public_key ||= public_key_path && File.read(public_key_path)
-        end
-
         def ready?
           status == :running
         end
@@ -151,15 +131,6 @@ module Fog
           end
         end
 
-        def scp(local_path, remote_path, upload_options = {})
-          raise 'Not Implemented'
-          # requires :addresses, :username
-          #
-          # options = {}
-          # options[:key_data] = [private_key] if private_key
-          # Fog::SCP.new(addresses['public'].first, username, options).upload(local_path, remote_path, scp_options)
-        end
-
         def setup(credentials = {})
           raise 'Not Implemented'
         #   requires :addresses, :identity, :public_key, :username
@@ -175,15 +146,6 @@ module Fog
         #   retry
         end
 
-        def ssh(commands)
-          raise 'Not Implemented'
-          # requires :addresses, :identity, :username
-          #
-          # options = {}
-          # options[:key_data] = [private_key] if private_key
-          # Fog::SSH.new(addresses['public'].first, username, options).run(commands)
-        end
-
         def start(type = 'headless')
           requires :raw
           # session, type in ['gui', 'headless'], key[=value]\n env variables
@@ -204,10 +166,6 @@ module Fog
           )
         end
 
-        def username
-          @username ||= 'root'
-        end
-
         private
 
         def raw

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

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/compute/models/server'
 
 module Fog
   module Compute
     class Vmfusion
 
-      class Server < Fog::Model
+      class Server < Fog::Compute::Server
 
         identity :name
 
@@ -14,7 +14,6 @@ module Fog
         attribute :path
 
         attr_accessor :password
-        attr_writer   :private_key, :private_key_path, :public_key, :public_key_path, :username
 
         # There is currently no documented model of creating VMs from scratch
         # sans Fusion's wizard.
@@ -179,21 +178,9 @@ module Fog
         # Sets up a conveinent way to SSH into a Fusion VM using credentials
         # stored in your .fog file.
 
-        def username
-          @username ||= 'root'
-        end
-
         # Simply spawn an SSH session.
         def ssh(commands)
-          requires :ipaddress, :username
-
-          #requires :password, :private_key
-          ssh_options={}
-          ssh_options[:password] = password unless password.nil?
-          ssh_options[:key_data] = [private_key] if private_key
-
-          Fog::SSH.new(ipaddress, @username, ssh_options).run(commands)
-
+          super(commands, password ? {:password => password} : {})
         end
 
         # SCP something to our VM.
@@ -238,26 +225,6 @@ module Fog
           Fog::SSH.new(ipaddress, username, credentials).run(commands)
         end
 
-        # Just setting local versions of some variables that were going to use
-        # for SSH operations.
-        def private_key_path
-          @private_key_path ||= Fog.credentials[:private_key_path]
-          @private_key_path &&= File.expand_path(@private_key_path)
-        end
-
-        def private_key
-          @private_key ||= private_key_path && File.read(private_key_path)
-        end
-
-        def public_key_path
-          @public_key_path ||= Fog.credentials[:public_key_path]
-          @public_key_path &&= File.expand_path(@public_key_path)
-        end
-
-        def public_key
-          @public_key ||= public_key_path && File.read(public_key_path)
-        end
-
         private
         def ip(fission)
           first_int = fission.network_info.data.keys.first

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

@@ -24,7 +24,7 @@ module Fog
         attribute :instance_uuid
         attribute :hostname
         attribute :operatingsystem
-        attribute :ipaddress
+        attribute :ipaddress,     :aliases => 'public_ip_address'
         attribute :power_state,   :aliases => 'power'
         attribute :tools_state,   :aliases => 'tools'
         attribute :tools_version

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

@@ -85,39 +85,10 @@ module Fog
         # As a result, we need a list of all virtual machines, and we
         # need them in "native" format, not filter attribute format.
         def list_all_virtual_machine_mobs
-          virtual_machines = Array.new
           # Find each datacenter
-          datacenters = @connection.rootFolder.children.find_all do |child|
-            child.kind_of? RbVmomi::VIM::Datacenter
-          end
+          datacenters = @connection.rootFolder.childEntity.grep(RbVmomi::VIM::Datacenter)
           # Next, search the "vmFolder" inventory of each data center:
-          datacenters.each do |dc|
-            inventory = dc.vmFolder.inventory( 'VirtualMachine' => :all )
-            virtual_machines << find_all_in_inventory(inventory, :type => RbVmomi::VIM::VirtualMachine, :property => 'name' )
-          end
-
-          virtual_machines.flatten
-        end
-
-        def find_all_in_inventory(inventory, properties = { :type => RbVmomi::VIM::VirtualMachine, :property => nil } )
-          results = Array.new
-
-          inventory.each do |k,v|
-
-            # If we have a VMware folder we need to traverse the directory
-            # to ensure we pick VMs inside folders. So we do a bit of recursion
-            # here.
-            results << find_all_in_inventory(v) if k.is_a? RbVmomi::VIM::Folder
-
-            if v[0].is_a? properties[:type]
-              if properties[:property].nil?
-                results << v[0]
-              else
-                results << v[1][properties[:property]]
-              end
-            end
-          end
-          results.flatten
+          datacenters.map {|dc| dc.vmFolder.childEntity.grep(RbVmomi::VIM::VirtualMachine) }.flatten
         end
 
         def get_folder_path(folder, root = nil)

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

@@ -30,17 +30,43 @@ module Fog
 
       class Real
         include Shared
+
+        # Clones a VM from a template or existing machine on your vSphere 
+        # Server.  
+        #
+        # ==== Parameters
+        # * options<~Hash>:
+        #   * 'template_path'<~String> - *REQUIRED* The path to the machine you 
+        #     want to clone FROM. (Example:
+        #     "/Datacenter/DataCenterNameHere/FolderNameHere/VMNameHere")
+        #   * 'name'<~String> - *REQUIRED* The VMName of the Destination  
+        #   * 'resource_pool'<~String> - The resource pool on your datacenter 
+        #     cluster you want to use.
+        #   * 'dest_folder'<~String> - Destination Folder of where 'name' will
+        #     be placed on your cluster. *NOT TESTED OR VALIDATED*
+        #   * 'power_on'<~Boolean> - Whether to power on machine after clone. 
+        #     Defaults to true.
+        #   * 'wait'<~Boolean> - Whether the method should wait for the virtual
+        #     machine to close finish cloning before returning information from 
+        #     vSphere. Returns the value of the machine if it finishes cloning 
+        #     in 150 seconds (1m30s) else it returns nil. 'wait' Defaults to nil. 
+        #     Saves a little time.
+        #   * 'transform'<~String> - Not documented - see http://www.vmware.com/support/developer/vc-sdk/visdk41pubs/ApiReference/vim.vm.RelocateSpec.html
+        #
         def vm_clone(options = {})
           # Option handling
           options = vm_clone_check_options(options)
 
+          # Added for people still using options['path']
+          template_path = options['path'] || options['template_path']
+
           notfound = lambda { raise Fog::Compute::Vsphere::NotFound, "Could not find VM template" }
 
           # Find the template in the folder.  This is more efficient than
           # searching ALL VM's looking for the template.
           # Tap gets rid of the leading empty string and "Datacenters" element
           # and returns the array.
-          path_elements = options['path'].split('/').tap { |ary| ary.shift 2 }
+          path_elements = template_path.split('/').tap { |ary| ary.shift 2 }
           # The DC name itself.
           template_dc = path_elements.shift
           # If the first path element contains "vm" this denotes the vmFolder
@@ -69,10 +95,10 @@ module Fog
           # Now find the template itself using the efficient find method
           vm_mob_ref = folder.find(template_name, RbVmomi::VIM::VirtualMachine)
 
-          # Now find _a_ resource pool to use for the clone
-          # (REVISIT: We need to support cloning into a specific RP)
-
-          if ( vm_mob_ref.resourcePool == nil )
+          # Now find _a_ resource pool to use for the clone if one is not specified
+          if ( options.has_key?('resource_pool') )
+            resource_pool = options['resource_pool']
+          elsif ( vm_mob_ref.resourcePool == nil )
             # If the template is really a template then there is no associated resource pool,
             # so we need to find one using the template's parent host or cluster
             esx_host = vm_mob_ref.collect!('runtime.host')['runtime.host']
@@ -123,9 +149,11 @@ module Fog
           end
           # And the clone specification
           clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(:location => relocation_spec,
-                                                            :powerOn  => options['power_on'] || true,
+                                                            :powerOn  => options.has_key?('power_on') ? options['power_on'] : true,
                                                             :template => false)
-          task = vm_mob_ref.CloneVM_Task(:folder => vm_mob_ref.parent, :name => options['name'], :spec => clone_spec)
+          task = vm_mob_ref.CloneVM_Task(:folder => options.has_key?('dest_folder') ? options['dest_folder'] : vm_mob_ref.parent,
+                                         :name => options['name'],
+                                         :spec => clone_spec)
           # Waiting for the VM to complete allows us to get the VirtulMachine
           # object of the new machine when it's done.  It is HIGHLY recommended
           # to set 'wait' => true if your app wants to wait.  Otherwise, you're

data/tests/aws/models/cdn/distribution_tests.rb

@@ -0,0 +1,15 @@
+Shindo.tests("Fog::CDN[:aws] | distribution", ['aws', 'cdn']) do
+  params = { :s3_origin => { 'DNSName' => 'fog_test_cdn.s3.amazonaws.com'}, :enabled => true }
+  model_tests(Fog::CDN[:aws].distributions, params, true) do
+    # distribution needs to be ready before being disabled
+    tests("#ready? - may take 15 minutes to complete...").succeeds do
+      @instance.wait_for { ready? }
+    end
+
+    # and disabled before being distroyed
+    tests("#disable - may take 15 minutes to complete...").succeeds do
+      @instance.disable
+      @instance.wait_for { ready? }
+    end
+  end
+end

data/tests/aws/models/cdn/distributions_tests.rb

@@ -0,0 +1,15 @@
+Shindo.tests("Fog::CDN[:aws] | distributions", ['aws', 'cdn']) do
+  params = { :s3_origin => { 'DNSName' => 'fog_test_cdn.s3.amazonaws.com'}, :enabled => true}
+  collection_tests(Fog::CDN[:aws].distributions, params, true) do
+    # distribution needs to be ready before being disabled
+    tests("#ready? - may take 15 minutes to complete...").succeeds do
+      @instance.wait_for { ready? }
+    end
+
+    # and disabled before being distroyed
+    tests("#disable - may take 15 minutes to complete...").succeeds do
+      @instance.disable
+      @instance.wait_for { ready? }
+    end
+  end
+end