fog 1.3.1 → 1.4.0

data/lib/fog/storm_on_demand/requests/compute/clone_server.rb

@@ -6,7 +6,7 @@ module Fog
         def clone_server(options = {})
           request(
             :path     => "/storm/server/clone",
-            :body     => MultiJson.encode({:params => options})
+            :body     => Fog::JSON.encode({:params => options})
           )
         end
 

data/lib/fog/storm_on_demand/requests/compute/create_server.rb

@@ -6,7 +6,7 @@ module Fog
         def create_server(options = {})
           request(
             :path     => "/storm/server/create",
-            :body     => MultiJson.encode({:params => options})
+            :body     => Fog::JSON.encode({:params => options})
           )
         end
 

data/lib/fog/storm_on_demand/requests/compute/delete_server.rb

@@ -6,7 +6,7 @@ module Fog
         def delete_server(options = {})
           request(
             :path     => "/storm/server/destroy",
-            :body     => MultiJson.encode({:params => options})
+            :body     => Fog::JSON.encode({:params => options})
           )
         end
 

data/lib/fog/storm_on_demand/requests/compute/get_server.rb

@@ -6,7 +6,7 @@ module Fog
         def get_server(options = {})
           request(
             :path     => "/storm/server/details",
-            :body     => MultiJson.encode({:params => options})
+            :body     => Fog::JSON.encode({:params => options})
           )
         end
 

data/lib/fog/storm_on_demand/requests/compute/get_stats.rb

@@ -6,7 +6,7 @@ module Fog
         def get_stats(options = {})
           request(
             :path     => "/monitoring/load/stats",
-            :body     => MultiJson.encode({:params => options})
+            :body     => Fog::JSON.encode({:params => options})
           )
         end
 

data/lib/fog/storm_on_demand/requests/compute/list_balancers.rb

@@ -6,7 +6,7 @@ module Fog
         def list_balancers(options = {})
           request(
             :path     => "/network/loadbalancer/list",
-            :body     => MultiJson.encode(options)
+            :body     => Fog::JSON.encode(options)
           )
         end
 

data/lib/fog/storm_on_demand/requests/compute/list_configs.rb

@@ -6,7 +6,7 @@ module Fog
         def list_configs(options = {})
           request(
             :path     => "/storm/config/list",
-            :body     => MultiJson.encode(options)
+            :body     => Fog::JSON.encode(options)
           )
         end
 

data/lib/fog/storm_on_demand/requests/compute/list_images.rb

@@ -6,7 +6,7 @@ module Fog
         def list_images(options = {})
           request(
             :path     => "/server/image/list",
-            :body     => MultiJson.encode(options)
+            :body     => Fog::JSON.encode(options)
           )
         end
 

data/lib/fog/storm_on_demand/requests/compute/list_private_ips.rb

@@ -6,7 +6,7 @@ module Fog
         def list_private_ips(options = {})
           request(
             :path     => "/network/private/get",
-            :body     => MultiJson.encode(options)
+            :body     => Fog::JSON.encode(options)
           )
         end
 

data/lib/fog/storm_on_demand/requests/compute/list_servers.rb

@@ -6,7 +6,7 @@ module Fog
         def list_servers(options = {})
           request(
             :path     => "/storm/server/list",
-            :body     => MultiJson.encode(options)
+            :body     => Fog::JSON.encode(options)
           )
         end
 

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

@@ -6,7 +6,7 @@ module Fog
         def list_templates(options = {})
           request(
             :path     => "/server/template/list",
-            :body     => MultiJson.encode(options)
+            :body     => Fog::JSON.encode(options)
           )
         end
 

data/lib/fog/storm_on_demand/requests/compute/reboot_server.rb

@@ -6,7 +6,7 @@ module Fog
         def reboot_server(options = {})
           request(
             :path     => "/storm/server/reboot",
-            :body     => MultiJson.encode({:params => options})
+            :body     => Fog::JSON.encode({:params => options})
           )
         end
 

data/lib/fog/storm_on_demand/requests/compute/remove_balancer_node.rb

@@ -6,7 +6,7 @@ module Fog
         def remove_balancer_node(options = {})
           request(
             :path     => "/network/loadbalancer/removenode",
-            :body     => MultiJson.encode({:params => options})
+            :body     => Fog::JSON.encode({:params => options})
           )
         end
 

data/lib/fog/storm_on_demand/requests/compute/resize_server.rb

@@ -6,7 +6,7 @@ module Fog
         def resize_server(options = {})
           request(
             :path     => "/storm/server/resize",
-            :body     => MultiJson.encode({:params => options})
+            :body     => Fog::JSON.encode({:params => options})
           )
         end
 

data/lib/fog/terremark.rb

@@ -1,4 +1,4 @@
-require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
+require 'fog/core'
 
 require 'fog/terremark/shared'
 require 'fog/terremark/parser'

data/lib/fog/terremark/shared.rb

@@ -61,7 +61,7 @@ module Fog
           end
           begin
             do_request(params)
-          rescue Excon::Errors::Unauthorized => e
+          rescue Excon::Errors::Unauthorized
             @cookie = auth_token
             do_request(params)
           end

data/lib/fog/vcloud.rb

@@ -1,4 +1,4 @@
-require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
+require 'fog/core'
 
 module Fog
   module Vcloud

data/lib/fog/vcloud/compute.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'vcloud'))
+require 'fog/vcloud'
 require 'fog/compute'
 
 module Fog
@@ -258,7 +258,7 @@ module Fog
           end
           begin
             do_request(params)
-          rescue Excon::Errors::Unauthorized => e
+          rescue Excon::Errors::Unauthorized
             do_login
             do_request(params)
           end

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

@@ -1,135 +1,3 @@
-# -*- coding: utf-8 -*-
-hardware_hash = {:xmlns_vcloud=>"http://www.vmware.com/vcloud/v1",
- :vcloud_href=>
-  "https://vcd01.esx.dev.int.realestate.com.au/api/v1.0/vApp/vm-624535987/virtualHardwareSection/",
- :vcloud_type=>"application/vnd.vmware.vcloud.virtualHardwareSection+xml",
- :"ovf:Info"=>"Virtual hardware requirements",
- :"ovf:System"=>
-  {:"vssd:ElementName"=>"Virtual Hardware Family",
-   :"vssd:InstanceID"=>"0",
-   :"vssd:VirtualSystemIdentifier"=>"centos",
-   :"vssd:VirtualSystemType"=>"vmx-07"},
- :"ovf:Item"=>
-  [{:"rasd:Address"=>"00:50:56:01:00:db",
-    :"rasd:AddressOnParent"=>"0",
-    :"rasd:AutomaticAllocation"=>"true",
-    :"rasd:Connection"=>"Gandalf_Dev_OrgNW_to_ExtNW_DirectConnect",
-    :"rasd:Description"=>"PCNet32 ethernet adapter",
-    :"rasd:ElementName"=>"Network adapter 0",
-    :"rasd:InstanceID"=>"1",
-    :"rasd:ResourceSubType"=>"PCNet32",
-    :"rasd:ResourceType"=>"10"},
-   {:"rasd:Address"=>"0",
-    :"rasd:Description"=>"SCSI Controller",
-    :"rasd:ElementName"=>"SCSI Controller 0",
-    :"rasd:InstanceID"=>"2",
-    :"rasd:ResourceSubType"=>"lsilogic",
-    :"rasd:ResourceType"=>"6"},
-   {:"rasd:AddressOnParent"=>"0",
-    :"rasd:Description"=>"Hard disk",
-    :"rasd:ElementName"=>"Hard disk 1",
-    :"rasd:HostResource"=>
-     {:vcloud_capacity=>"8192",
-      :vcloud_busType=>"6",
-      :vcloud_busSubType=>"lsilogic"},
-    :"rasd:InstanceID"=>"2000",
-    :"rasd:Parent"=>"2",
-    :"rasd:ResourceType"=>"17"},
-   {:"rasd:Address"=>"0",
-    :"rasd:Description"=>"IDE Controller",
-    :"rasd:ElementName"=>"IDE Controller 0",
-    :"rasd:InstanceID"=>"3",
-    :"rasd:ResourceType"=>"5"},
-   {:"rasd:AddressOnParent"=>"0",
-    :"rasd:AutomaticAllocation"=>"false",
-    :"rasd:Description"=>"CD/DVD Drive",
-    :"rasd:ElementName"=>"CD/DVD Drive 1",
-    :"rasd:HostResource"=>"",
-    :"rasd:InstanceID"=>"3000",
-    :"rasd:Parent"=>"3",
-    :"rasd:ResourceType"=>"15"},
-   {:"rasd:AddressOnParent"=>"0",
-    :"rasd:AutomaticAllocation"=>"false",
-    :"rasd:Description"=>"Floppy Drive",
-    :"rasd:ElementName"=>"Floppy Drive 1",
-    :"rasd:HostResource"=>"",
-    :"rasd:InstanceID"=>"8000",
-    :"rasd:ResourceType"=>"14"},
-   {:vcloud_href=>
-     "https://vcd01.esx.dev.int.realestate.com.au/api/v1.0/vApp/vm-624535987/virtualHardwareSection/cpu",
-    :vcloud_type=>"application/vnd.vmware.vcloud.rasdItem+xml",
-    :"rasd:AllocationUnits"=>"hertz * 10^6",
-    :"rasd:Description"=>"Number of Virtual CPUs",
-    :"rasd:ElementName"=>"1 virtual CPU(s)",
-    :"rasd:InstanceID"=>"4",
-    :"rasd:Reservation"=>"0",
-    :"rasd:ResourceType"=>"3",
-    :"rasd:VirtualQuantity"=>"1",
-    :"rasd:Weight"=>"0",
-    :Link=>
-     {:rel=>"edit",
-      :type=>"application/vnd.vmware.vcloud.rasdItem+xml",
-      :href=>
-       "https://vcd01.esx.dev.int.realestate.com.au/api/v1.0/vApp/vm-624535987/virtualHardwareSection/cpu"}},
-   {:vcloud_href=>
-     "https://vcd01.esx.dev.int.realestate.com.au/api/v1.0/vApp/vm-624535987/virtualHardwareSection/memory",
-    :vcloud_type=>"application/vnd.vmware.vcloud.rasdItem+xml",
-    :"rasd:AllocationUnits"=>"byte * 2^20",
-    :"rasd:Description"=>"Memory Size",
-    :"rasd:ElementName"=>"512 MB of memory",
-    :"rasd:InstanceID"=>"5",
-    :"rasd:Reservation"=>"0",
-    :"rasd:ResourceType"=>"4",
-    :"rasd:VirtualQuantity"=>"768",
-    :"rasd:Weight"=>"0",
-    :Link=>
-     {:rel=>"edit",
-      :type=>"application/vnd.vmware.vcloud.rasdItem+xml",
-      :href=>
-       "https://vcd01.esx.dev.int.realestate.com.au/api/v1.0/vApp/vm-624535987/virtualHardwareSection/memory"}}],
- :Link=>
-  [{:rel=>"edit",
-    :type=>"application/vnd.vmware.vcloud.virtualHardwareSection+xml",
-    :href=>
-     "https://vcd01.esx.dev.int.realestate.com.au/api/v1.0/vApp/vm-624535987/virtualHardwareSection/"},
-   {:rel=>"down",
-    :type=>"application/vnd.vmware.vcloud.rasdItem+xml",
-    :href=>
-     "https://vcd01.esx.dev.int.realestate.com.au/api/v1.0/vApp/vm-624535987/virtualHardwareSection/cpu"},
-   {:rel=>"edit",
-    :type=>"application/vnd.vmware.vcloud.rasdItem+xml",
-    :href=>
-     "https://vcd01.esx.dev.int.realestate.com.au/api/v1.0/vApp/vm-624535987/virtualHardwareSection/cpu"},
-   {:rel=>"down",
-    :type=>"application/vnd.vmware.vcloud.rasdItem+xml",
-    :href=>
-     "https://vcd01.esx.dev.int.realestate.com.au/api/v1.0/vApp/vm-624535987/virtualHardwareSection/memory"},
-   {:rel=>"edit",
-    :type=>"application/vnd.vmware.vcloud.rasdItem+xml",
-    :href=>
-     "https://vcd01.esx.dev.int.realestate.com.au/api/v1.0/vApp/vm-624535987/virtualHardwareSection/memory"},
-   {:rel=>"down",
-    :type=>"application/vnd.vmware.vcloud.rasdItemsList+xml",
-    :href=>
-     "https://vcd01.esx.dev.int.realestate.com.au/api/v1.0/vApp/vm-624535987/virtualHardwareSection/disks"},
-   {:rel=>"edit",
-    :type=>"application/vnd.vmware.vcloud.rasdItemsList+xml",
-    :href=>
-     "https://vcd01.esx.dev.int.realestate.com.au/api/v1.0/vApp/vm-624535987/virtualHardwareSection/disks"},
-   {:rel=>"down",
-    :type=>"application/vnd.vmware.vcloud.rasdItemsList+xml",
-    :href=>
-     "https://vcd01.esx.dev.int.realestate.com.au/api/v1.0/vApp/vm-624535987/virtualHardwareSection/media"},
-   {:rel=>"down",
-    :type=>"application/vnd.vmware.vcloud.rasdItemsList+xml",
-    :href=>
-     "https://vcd01.esx.dev.int.realestate.com.au/api/v1.0/vApp/vm-624535987/virtualHardwareSection/networkCards"},
-   {:rel=>"edit",
-    :type=>"application/vnd.vmware.vcloud.rasdItemsList+xml",
-    :href=>
-     "https://vcd01.esx.dev.int.realestate.com.au/api/v1.0/vApp/vm-624535987/virtualHardwareSection/networkCards"}]}
-
-
 module Fog
   module Vcloud
     class Compute
@@ -238,10 +106,4 @@ module Fog
       end
     end
   end
-end
-
-if $0 == __FILE__
-  require 'builder'
-  i = Fog::Vcloud::Compute::Real.new
-  puts i.generate_configure_vm_request(hardware_hash)
-end
+end

data/lib/fog/virtual_box.rb

@@ -1,4 +1,4 @@
-require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
+require 'fog/core'
 
 module Fog
   module VirtualBox

data/lib/fog/virtual_box/compute.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'virtual_box'))
+require 'fog/virtual_box'
 require 'fog/compute'
 
 module Fog

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

@@ -167,8 +167,8 @@ module Fog
         #     %{mkdir .ssh},
         #     %{echo "#{public_key}" >> ~/.ssh/authorized_keys},
         #     %{passwd -l #{username}},
-        #     %{echo "#{MultiJson.encode(attributes)}" >> ~/attributes.json},
-        #     %{echo "#{MultiJson.encode(metadata)}" >> ~/metadata.json}
+        #     %{echo "#{Fog::JSON.encode(attributes)}" >> ~/attributes.json},
+        #     %{echo "#{Fog::JSON.encode(metadata)}" >> ~/metadata.json}
         #   ])
         # rescue Errno::ECONNREFUSED
         #   sleep(1)

data/lib/fog/vmfusion.rb

@@ -1,4 +1,4 @@
-require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
+require 'fog/core'
 
 module Fog
   module Vmfusion

data/lib/fog/vmfusion/compute.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'vmfusion'))
+require 'fog/vmfusion'
 require 'fog/compute'
 
 module Fog

data/lib/fog/volume.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Volume
+
+    def self.[](provider)
+      self.new(:provider => provider)
+    end
+
+    def self.new(attributes)
+      attributes = attributes.dup # Prevent delete from having side effects
+      case provider = attributes.delete(:provider).to_s.downcase.to_sym
+      when :openstack
+        require 'fog/openstack/volume'
+        Fog::Volume::OpenStack.new(attributes)
+      else
+        raise ArgumentError.new("#{provider} has no identity service")
+      end
+    end
+
+    def self.providers
+      Fog.services[:volume]
+    end
+
+  end
+end
+

data/lib/fog/voxel.rb

@@ -1,4 +1,4 @@
-require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
+require 'fog/core'
 require 'digest/md5'
 
 module Fog

data/lib/fog/voxel/compute.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'voxel'))
+require 'fog/voxel'
 require 'fog/compute'
 
 module Fog

data/lib/fog/vsphere/compute.rb

@@ -27,6 +27,7 @@ module Fog
       request :vm_reconfig_hardware
       request :vm_reconfig_memory
       request :vm_reconfig_cpus
+      request :vm_config_vnc
 
       module Shared
 
@@ -49,6 +50,8 @@ module Fog
           :tools_state => 'guest.toolsStatus',
           :tools_version => 'guest.toolsVersionStatus',
           :is_a_template => 'config.template',
+          :memory_mb => 'config.hardware.memoryMB',
+          :cpus   => 'config.hardware.numCPU',
         }
 
         # Utility method to convert a VMware managed object into an attribute hash.
@@ -58,15 +61,15 @@ module Fog
         def convert_vm_mob_ref_to_attr_hash(vm_mob_ref)
           return nil unless vm_mob_ref
 
-          props = vm_mob_ref.collect! *ATTR_TO_PROP.values.uniq
+          props = vm_mob_ref.collect!(*ATTR_TO_PROP.values.uniq)
           # 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
           # API. The hypervisor name and mac_addresses attributes may not be available
           # so we need catch any exceptions thrown during lookup and set them to nil.
           #
-          # The use of the "tap" method here is a convience, it allows us to update the
-          # hash object without expliclty returning the hash at the end of the method.
+          # The use of the "tap" method here is a convenience, it allows us to update the
+          # hash object without explicitly returning the hash at the end of the method.
           Hash[ATTR_TO_PROP.map { |k,v| [k.to_s, props[v]] }].tap do |attrs|
             attrs['id'] ||= vm_mob_ref._ref
             attrs['mo_ref'] = vm_mob_ref._ref

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

@@ -34,26 +34,31 @@ module Fog
         attribute :connection_state
         attribute :mo_ref
         attribute :path
+        attribute :memory_mb
+        attribute :cpus
 
         def vm_reconfig_memory(options = {})
           requires :instance_uuid, :memory
           connection.vm_reconfig_memory('instance_uuid' => instance_uuid, 'memory' => memory)
         end
+
         def vm_reconfig_cpus(options = {})
           requires :instance_uuid, :cpus
           connection.vm_reconfig_cpus('instance_uuid' => instance_uuid, 'cpus' => cpus)
         end
+
         def vm_reconfig_hardware(options = {})
           requires :instance_uuid, :hardware_spec
           connection.vm_reconfig_hardware('instance_uuid' => instance_uuid, 'hardware_spec' => hardware_spec)
         end
+
         def start(options = {})
           requires :instance_uuid
           connection.vm_power_on('instance_uuid' => instance_uuid)
         end
 
         def stop(options = {})
-          options = { :force => false }.merge(options)
+          options = { :force => !tools_installed? }.merge(options)
           requires :instance_uuid
           connection.vm_power_off('instance_uuid' => instance_uuid, 'force' => options[:force])
         end
@@ -82,6 +87,7 @@ module Fog
           new_vm.connection = self.connection
           new_vm
         end
+
         def clone(options = {})
           requires :name, :path
           # Convert symbols to strings
@@ -100,6 +106,30 @@ module Fog
           new_vm
         end
 
+        def ready?
+          power_state == "poweredOn"
+        end
+
+        def tools_installed?
+          tools_state != "toolsNotInstalled"
+        end
+
+        # defines VNC attributes on the hypervisor
+        def config_vnc(options = {})
+          requires :instance_uuid
+          connection.vm_config_vnc(options.merge('instance_uuid' => instance_uuid))
+        end
+
+        # returns a hash of VNC attributes required for connection
+        def vnc
+          requires :instance_uuid
+          connection.vm_get_vnc(instance_uuid)
+        end
+
+        def memory
+          memory_mb * 1024 * 1024
+        end
+
       end
 
     end