fog 1.1.2 → 1.2.0

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

@@ -4,7 +4,7 @@ module Fog
       class CatalogItem < Fog::Vcloud::Model
 
         identity :href, :aliases => :Href
-
+        attribute :links, :aliases => :Link, :type => :array
         ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
 
         attribute :type

data/lib/fog/vcloud/models/compute/catalogs.rb

@@ -11,14 +11,12 @@ module Fog
 
         def all
           org_uri = self.organization_uri || connection.default_organization_uri
-          data = connection.get_organization(org_uri).body[:Link].select { |link| link[:type] == "application/vnd.vmware.vcloud.catalog+xml" }
+          data = connection.get_organization(org_uri).links.select { |link| link[:type] == "application/vnd.vmware.vcloud.catalog+xml" }
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_catalog(uri)
-            new(data.body)
-          end
+          connection.get_catalog(uri)
         rescue Fog::Errors::NotFound
           nil
         end

data/lib/fog/vcloud/models/compute/ip.rb

@@ -3,9 +3,9 @@ module Fog
     class Compute
       class Ip < Fog::Vcloud::Model
 
-        ignore_attributes :xmlns_i, :xmlns
-
         identity :href, :aliases => :Href
+        attribute :links, :aliases => :Link, :type => :array
+        ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
 
         attribute :name, :aliases => :Name
         attribute :status, :aliases => :Status

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

@@ -4,8 +4,8 @@ module Fog
       class Network < Fog::Vcloud::Model
 
         identity :href, :aliases => :Href
-
-        ignore_attributes :xmlns, :xmlns_xsi, :xmlns_xsd, :xmlns_i, :Id
+        attribute :links, :aliases => :Link, :type => :array
+        ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
 
         attribute :name, :aliases => :Name
 
@@ -13,15 +13,9 @@ module Fog
         attribute :configuration, :aliases => :Configuration
         attribute :provider_info, :aliases => :ProviderInfo
 
-        attribute :links, :aliases => :Link, :type => :array
-
         def parent_network
           return nil if configuration[:ParentNetwork].nil?
-          @parent_network ||= Fog::Vcloud::Compute::Network.new(
-            :connection => connection,
-            :collection => Fog::Vcloud::Compute::Networks.new(:connection => connection),
-            :href => configuration[:ParentNetwork][:href]
-          )
+          @parent_network ||= connection.get_network(configuration[:ParentNetwork][:href])
         end
       end
     end

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

@@ -17,26 +17,31 @@ module Fog
           data = nil
           if self.href =~ /\/vdc\//
             check_href!("Vdc")
-            data = [connection.get_vdc(self.href).body[:AvailableNetworks][:Network]].flatten.compact
+            data = [connection.get_vdc(self.href).available_networks].flatten.compact.reject{|n| n == '' }
           elsif self.href =~ /\/org\//
             check_href!("Org")
-            links = (l=connection.get_organization(self.href).body[:Link]).is_a?(Array) ? l : [l].compact
-            data = links.select{|l| l[:type] == 'application/vnd.vmware.vcloud.network+xml' }
+            data = connection.get_organization(self.href).links.select{|l| l[:type] == network_type_id }
           elsif self.href =~ /\/vApp\//
             check_href!("Vapp")
-            data = [(connection.get_vapp(self.href).body[:NetworkConfigSection]||{})[:NetworkConfig]].flatten.compact.collect{|n| n[:Configuration][:ParentNetwork] unless n[:Configuration].nil? }.compact
+            data = [(connection.get_vapp(self.href).network_configs||{})[:NetworkConfig]].flatten.compact.collect{|n| n[:Configuration][:ParentNetwork] unless n[:Configuration].nil? }.compact
           end
           load([*data]) unless data.nil?
         end
 
         def get(uri)
-          if data = connection.get_network(uri)
-            new(data.body)
-          end
-          rescue Fog::Errors::NotFound
+          connection.get_network(uri)
+        rescue Fog::Errors::NotFound
           nil
         end
 
+        private
+        def network_type_id
+          if connection.version == '1.0'
+            'application/vnd.vmware.vcloud.network+xml'
+          else
+            'application/vnd.vmware.vcloud.orgNetwork+xml'
+          end
+        end
       end
     end
   end

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

@@ -3,15 +3,14 @@ module Fog
     class Compute
       class Organization < Fog::Vcloud::Model
 
-        identity :href
-
-        ignore_attributes :xmlns, :xmlns_xsi, :xmlns_xsd
+        identity :href, :aliases => :Href
+        attribute :links, :aliases => :Link, :type => :array
+        ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
 
         attribute :name
         attribute :description, :aliases => :Description
         attribute :type
         attribute :full_name, :aliases => :FullName
-        attribute :other_links, :aliases => :Link
 
         def networks
           @networks ||= Fog::Vcloud::Compute::Networks.

data/lib/fog/vcloud/models/compute/organizations.rb

@@ -11,15 +11,18 @@ module Fog
         undef_method :create
 
         def all
-          data = connection.login.body[:Org].select { |org| org[:type] == "application/vnd.vmware.vcloud.org+xml" }
+          raw_orgs = if connection.version == '1.0'
+            connection.login
+          else
+            connection.request(connection.basic_request_params("#{connection.base_path_url}/org/"))
+          end
+          data = raw_orgs.body[:Org].select { |org| org[:type] == "application/vnd.vmware.vcloud.org+xml" }
           data.each { |org| org.delete_if { |key, value| [:rel].include?(key) } }
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_organization(uri)
-            new(data.body)
-          end
+          connection.get_organization(uri)
         rescue Fog::Errors::NotFound
           nil
         end

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

@@ -7,7 +7,7 @@ module Fog
         include Fog::Vcloud::Compute::Helpers::Status
 
         identity :href, :aliases => :Href
-
+        attribute :links, :aliases => :Link, :type => :array
         ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
 
         attribute :type
@@ -24,9 +24,10 @@ module Fog
         attribute :guest_customization, :aliases => :GuestCustomizationSection
         attribute :operating_system, :aliases => :'ovf:OperatingSystemSection'
 
-        attribute :links, :aliases => :Link, :type => :array
         attribute :tasks, :aliases => :Tasks, :type => :array
 
+        has_up :vapp
+
         def computer_name
           load_unless_loaded!
           self.guest_customization[:ComputerName]
@@ -44,7 +45,7 @@ module Fog
 
         def ip_addresses
           load_unless_loaded!
-          self.network_connections.collect{|n| n[:IpAddress] }
+          [self.network_connections].flatten.collect{|n| n[:IpAddress] }
         end
 
         def ready?
@@ -262,7 +263,7 @@ module Fog
         end
 
         def reload_status
-          self.status = connection.get_vapp(href).body[:status]
+          self.status = connection.get_vapp(href).status
         end
       end
     end

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

@@ -19,11 +19,7 @@ module Fog
         end
 
         def get(uri)
-          if data = connection.get_vapp(uri)
-            # If no tasks returned, set a mock entry to flush on reload
-            data.body[:Tasks] = {} unless data.body[:Tasks]
-            new(data.body)
-          end
+          connection.get_vapp(uri)
         rescue Fog::Errors::NotFound
           nil
         end

data/lib/fog/vcloud/models/compute/task.rb

@@ -4,7 +4,7 @@ module Fog
       class Task < Fog::Vcloud::Model
 
         identity :href, :aliases => :Href
-
+        attribute :links, :aliases => :Link, :type => :array
         ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
 
         attribute :status

data/lib/fog/vcloud/models/compute/tasks.rb

@@ -19,9 +19,7 @@ module Fog
         end
 
         def get(uri)
-          if data = connection.get_task(uri)
-            new(data.body)
-          end
+          connection.get_task(uri)
         rescue Fog::Errors::NotFound
           nil
         end

data/lib/fog/vcloud/models/compute/vapp.rb

@@ -6,9 +6,9 @@ module Fog
 
         include Fog::Vcloud::Compute::Helpers::Status
 
-        identity :href
-
-        ignore_attributes :xmlns, :xmlns_xsi, :xmlns_xsd
+        identity :href, :aliases => :Href
+        attribute :links, :aliases => :Link, :type => :array
+        ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
 
         attribute :name
         attribute :type
@@ -19,7 +19,9 @@ module Fog
         attribute :children, :aliases => :Children, :squash => :Vm
         attribute :lease_settings, :aliases => :LeaseSettingsSection
 
-        attribute :other_links, :aliases => :Link
+        attribute :network_configs, :aliases => :NetworkConfigSection
+
+        has_up :vdc
 
         def servers
           @servers ||= Fog::Vcloud::Compute::Servers.

data/lib/fog/vcloud/models/compute/vapps.rb

@@ -13,15 +13,11 @@ module Fog
         attribute :href
 
         def all
-          resource_entities = (re=connection.get_vdc(self.href).body[:ResourceEntities][:ResourceEntity]).is_a?(Array) ? re : [re].compact
-          data = resource_entities.select { |re| re[:type] == "application/vnd.vmware.vcloud.vApp+xml" }
-          load(data)
+          load([connection.get_vdc(self.href).resource_entities].flatten.select { |re| re[:type] == "application/vnd.vmware.vcloud.vApp+xml" })
         end
 
         def get(uri)
-          if data = connection.get_vapp(uri)
-            new(data.body)
-          end
+          connection.get_vapp(uri)
         rescue Fog::Errors::NotFound
           nil
         end

data/lib/fog/vcloud/models/compute/vdc.rb

@@ -3,9 +3,9 @@ module Fog
     class Compute
       class Vdc < Fog::Vcloud::Model
 
-        identity :href
-
-        ignore_attributes :xmlns, :xmlns_xsi, :xmlns_xsd
+        identity :href, :aliases => :Href
+        attribute :links, :aliases => :Link, :type => :array
+        ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
 
         attribute :name
         attribute :type
@@ -18,10 +18,10 @@ module Fog
         attribute :storage_capacity, :aliases => :StorageCapacity
         attribute :available_networks, :aliases => :AvailableNetworks, :squash => :Network
 
-        attribute :other_links, :aliases => :Link
-
         attribute :resource_entities, :aliases => :ResourceEntities, :squash => :ResourceEntity
 
+        has_up :organization
+
         def networks
           @networks ||= Fog::Vcloud::Compute::Networks.
             new( :connection => connection,

data/lib/fog/vcloud/models/compute/vdcs.rb

@@ -13,16 +13,13 @@ module Fog
         attribute :href
 
         def all
-          links = (l=connection.get_organization(org_uri).body[:Link]).is_a?(Array) ? l : [l].compact
-          data = links.select { |link| link[:type] == "application/vnd.vmware.vcloud.vdc+xml" }
+          data = connection.get_organization(org_uri).links.select { |link| link[:type] == "application/vnd.vmware.vcloud.vdc+xml" }
           data.each { |link| link.delete_if { |key, value| [:rel].include?(key) } }
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_vdc(uri)
-            new(data.body)
-          end
+          connection.get_vdc(uri)
         rescue Fog::Errors::NotFound
           nil
         end

data/lib/fog/vcloud/requests/compute/clone_vapp.rb

@@ -5,7 +5,7 @@ module Fog
 
         def validate_clone_vapp_options(options)
           valid_opts = [:name, :poweron]
-          unless valid_opts.all? { |opt| options.keys.include?(opt) }
+          unless valid_opts.all? { |opt| options.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - options.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/fog/vcloud/requests/compute/configure_network.rb

@@ -5,7 +5,7 @@ module Fog
 
         def validate_network_data(network_data, configure=false)
           valid_opts = [:id, :href, :name, :address, :broadcast, :gateway]
-          unless valid_opts.all? { |opt| network_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| network_data.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - network_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/fog/vcloud/requests/compute/configure_network_ip.rb

@@ -6,7 +6,7 @@ module Fog
 
         def validate_network_ip_data(network_ip_data)
           valid_opts = [:id, :href, :name, :status, :server]
-          unless valid_opts.all? { |opt| network_ip_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| network_ip_data.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - network_ip_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/fog/vcloud/requests/compute/configure_vapp.rb

@@ -6,7 +6,7 @@ module Fog
 
         def validate_vapp_data(vapp_data)
           valid_opts = [:name, :cpus, :memory, :disks]
-          unless valid_opts.all? { |opt| vapp_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| vapp_data.has_key?(opt) }
             raise ArgumentError.new("Required Vapp data missing: #{(valid_opts - vapp_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/fog/vcloud/requests/compute/configure_vm.rb

@@ -138,7 +138,7 @@ module Fog
 
         def validate_vm_data(vm_data)
           valid_opts = [:name, :cpus, :memory, :disks]
-          unless valid_opts.all? { |opt| vm_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| vm_data.has_key?(opt) }
             raise ArgumentError.new("Required vm data missing: #{(valid_opts - vm_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/fog/vcloud/requests/compute/instantiate_vapp_template.rb

@@ -7,7 +7,7 @@ module Fog
         def validate_instantiate_vapp_template_options options
           # :network_uri removed, if not specified will use template network config.
           valid_opts = [:catalog_item_uri, :name, :vdc_uri]
-          unless valid_opts.all? { |opt| options.keys.include?(opt) }
+          unless valid_opts.all? { |opt| options.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - options.keys).map(&:inspect).join(", ")}")
           end
           

data/lib/fog/vcloud/requests/compute/login.rb

@@ -6,14 +6,18 @@ module Fog
 
 
         def login
+          headers = { 'Authorization' => authorization_header }
+          uri = if version == '1.0'
+            "#{base_url}/login"
+          else
+            "#{base_path_url}/sessions"
+          end
           unauthenticated_request({
             :expects  => 200,
-            :headers  => {
-              'Authorization' => authorization_header
-            },
+            :headers  => headers,
             :method   => 'POST',
             :parse    => true,
-            :uri      => "#{base_url}/login"
+            :uri      => uri
           })
         end
 

data/lib/fog/virtual_box/compute.rb

@@ -34,6 +34,10 @@ module Fog
           @connection = ::VirtualBox::Global.global.lib.virtualbox
         end
 
+        def respond_to?(method, *)
+          super or @connection.respond_to? method
+        end
+
         # hack to provide 'requests'
         def method_missing(method_sym, *arguments, &block)
           if @connection.respond_to?(method_sym)

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

@@ -8,150 +8,209 @@ module Fog
 
         identity :name
 
-        attribute :name
-        attribute :state
+        attribute :ipaddress
+        attribute :power_state
+        attribute :mac_addresses
+        attribute :path
 
         attr_accessor :password
         attr_writer   :private_key, :private_key_path, :public_key, :public_key_path, :username
 
-        def initalize(attributes={})
-        end
-
+        # There is currently no documented model of creating VMs from scratch
+        # sans Fusion's wizard.
         def save
           raise Fog::Errors::Error.new('Creating a new vm is not yet supported')
         end
 
+        # Fussion doesn't have the concept of templates so one just clones
+        # regular VMs.
         def clone(name)
           requires :raw
 
-          ::Fission::VM.clone(@raw.name,name)
+          ::Fission::VM.clone(@raw[:fission].name,name)
           return connection.servers.get(name)
         end
 
-        def destroy(options={ :force => false})
+        # Destroy, deletes the VM from the local disk but only hard stops the VM
+        # before doing so if you set :force to true.
+        def destroy(options = { :force => false })
           requires :raw
 
-          if state=="running"
+          if ready?
             if options[:force]
-              @raw.stop
+              stop
             end
           end
 
-          ::Fission::VM.delete @raw.name
+          @raw[:fission].delete
         end
 
-        def start
+        # Start is pretty self explanatory...if you pass :headless as true you
+        # won't get a console on launch.
+        def start(options = { :headless => false })
           requires :raw
 
-          unless state=="running"
-            @raw.start
+          unless ready?
+            @raw[:fission].start(:headless => options[:headless])
             return true
           else
             return false
           end
         end
 
+        # We're covering a lot of bases here with the different ways one can
+        # stop a VM from running.
+
+        # Stop is a hard stop, like pulling out the power cord.
         def stop
           requires :raw
 
-          if state=="running"
-            @raw.stop
+          if ready?
+            @raw[:fission].stop(:hard => true)
             return true
           else
             return false
           end
         end
 
-        def reboot
+        # Halt and poweroff are just synonyms for stop.
+        def halt
+          stop
+        end
+
+        def poweroff
+          stop
+        end
+
+        # This is a graceful shutdown but Fusion is only capable of a graceful
+        # shutdown if tools are installed.  Fusion does the right thing though
+        # and if graceful can't be initiated it just does a hard stop.
+        def shutdown
           requires :raw
-          if state=="running"
-            @raw.stop
-            wait_for { state!="running"}
-            @raw.start
+          if ready?
+            @raw[:fission].stop
             return true
           else
             return false
           end
         end
 
-        def halt
-          requires :raw
-          if state=="running"
-            @raw.halt
+        # Attempt a graceful shutdown, wait for the VM to completely shutdown
+        # and then start it again.
+        def reboot
+          if ready?
+            shutdown
+            wait_for { ! ready? }
+            start
             return true
           else
             return false
           end
+        end
 
+        # Resuming from suspend is the same thing as start to Fusion.
+        def resume
+          start
         end
 
-        def poweroff
+        def suspend
           requires :raw
-          halt
+          if ready?
+            @raw[:fission].suspend
+            return true
+          else
+            return false
+          end
         end
 
-        def shutdown
+        # Fusion VM Metadata.
+
+        # The power state of the VM is commonly going to be three values;
+        # running, not running, or suspended.
+        def power_state
           requires :raw
-          stop
+          @raw[:fission].state.data
         end
 
-        def resume
+        def ready?
           requires :raw
-          @raw.resume
+          @raw[:fission].running?.data
         end
 
-        def suspend
+        # Path to the VM's vmx file on the local disk.
+        def path
           requires :raw
-          @raw.suspend
+          @raw[:fission].path
         end
 
-        def state
+        # We obtain the first ipaddress.  This should generally be a safe
+        # assumption for Fusion.  Even if an address is provided via NAT,
+        # bridge, or host only it will by accessible from the host machine the
+        # VM resides on.
+        def ipaddress
           requires :raw
-          @raw.state
+          ip(@raw[:fission])
         end
 
-        def ready?
-          state == "running"
+        # Keeping these three methods around for API compatibility reasons.
+        # Makes the vmfusion provider function similar to cloud providers and
+        # the vsphere provider.  Future goal is to add an actual private and
+        # public concept.  Needs changes to fission and a determination what is
+        # a public or private address here; bridge, nat, host-only.
+        def public_ip_address
+          ipaddress
         end
 
         def private_ip_address
-          ip_address(:private)
+          ipaddress
         end
 
-        def public_ip_address
-          ip_address(:public)
+        def state
+          power_state
+        end
+
+        # Collecting all mac_addresses the VM has...mostly just because we are
+        # doing the same thing for the vSphere provider.
+        def mac_addresses
+          requires :raw
+          macs(@raw[:fission])
         end
 
+        # 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 :public_ip_address, :username
+          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(public_ip_address, @username, ssh_options).run(commands)
+          Fog::SSH.new(ipaddress, @username, ssh_options).run(commands)
 
         end
 
+        # SCP something to our VM.
         def scp(local_path, remote_path, upload_options = {})
-          requires :public_ip_address, :username
+          requires :ipaddress, :username
 
           scp_options = {}
           scp_options[:password] = password unless self.password.nil?
           scp_options[:key_data] = [private_key] if self.private_key
 
-          Fog::SCP.new(public_ip_address, username, scp_options).upload(local_path, remote_path, upload_options)
+          Fog::SCP.new(ipaddress, username, scp_options).upload(local_path, remote_path, upload_options)
         end
 
-        # Sets up a new key
+        # Sets up a new SSH key on the VM so one doesn't need to use a password
+        # ever again.
         def setup(credentials = {})
-          requires :public_key, :public_ip_address, :username
+          requires :public_key, :ipaddress, :username
 
           credentials[:password] = password unless self.password.nil?
           credentails[:key_data] = [private_key] if self.private_key
@@ -167,7 +226,7 @@ module Fog
           Timeout::timeout(360) do
             begin
               Timeout::timeout(8) do
-                Fog::SSH.new(public_ip_address, username, credentials.merge(:timeout => 4)).run('pwd')
+                Fog::SSH.new(ipaddress, username, credentials.merge(:timeout => 4)).run('pwd')
               end
             rescue Errno::ECONNREFUSED
               sleep(2)
@@ -176,9 +235,11 @@ module Fog
               retry
             end
           end
-          Fog::SSH.new(public_ip_address, username, credentials).run(commands)
+          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)
@@ -198,8 +259,13 @@ module Fog
         end
 
         private
-        def ip_address(key)
-          @raw.ip_address
+        def ip(fission)
+          first_int = fission.network_info.data.keys.first
+          fission.network_info.data[first_int]['ip_address']
+        end
+
+        def macs(fission)
+          fission.mac_addresses.data
         end
 
         def raw
@@ -210,13 +276,15 @@ module Fog
           @raw = new_raw
 
           raw_attributes = {
-            :name => new_raw.name,
-            :state => new_raw.state
+            :name            => new_raw[:fission].name,
+            :power_state     => new_raw[:state],
+            :ipaddress       => ip(new_raw[:fission]),
+            :mac_addresses   => macs(new_raw[:fission]),
+            :path            => new_raw[:fission].path
           }
 
           merge_attributes(raw_attributes)
         end
-
       end
     end
   end