fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

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

@@ -60,7 +60,7 @@ module Fog
           raise Fog::Errors::Error.new('Saving an existing server may create a duplicate') unless new?
           create_or_clone_volume unless xml or @volumes
           @xml ||= to_xml
-          self.id = (persistent ? connection.define_domain(xml) : connection.create_domain(xml)).uuid
+          self.id = (persistent ? service.define_domain(xml) : service.create_domain(xml)).uuid
           reload
         rescue => e
           raise Fog::Errors::Error.new("Error saving the server: #{e}")
@@ -68,7 +68,7 @@ module Fog
 
         def start
           return true if active?
-          connection.vm_action(uuid, :create)
+          service.vm_action(uuid, :create)
           reload
           true
         end
@@ -83,29 +83,29 @@ module Fog
 
         def destroy(options={ :destroy_volumes => false})
           poweroff unless stopped?
-          connection.vm_action(uuid, :undefine)
+          service.vm_action(uuid, :undefine)
           volumes.each { |vol| vol.destroy } if options[:destroy_volumes]
           true
         end
 
         def reboot
-          connection.vm_action(uuid, :reboot)
+          service.vm_action(uuid, :reboot)
         end
 
         def poweroff
-          connection.vm_action(uuid, :destroy)
+          service.vm_action(uuid, :destroy)
         end
 
         def shutdown
-          connection.vm_action(uuid, :shutdown)
+          service.vm_action(uuid, :shutdown)
         end
 
         def resume
-          connection.vm_action(uuid, :resume)
+          service.vm_action(uuid, :resume)
         end
 
         def suspend
-          connection.vm_action(uuid, :suspend)
+          service.vm_action(uuid, :suspend)
         end
 
         def stopped?
@@ -123,7 +123,7 @@ module Fog
 
         def volumes
           # lazy loading of volumes
-          @volumes ||= (@volumes_path || []).map{|path| connection.volumes.all(:path => path).first }
+          @volumes ||= (@volumes_path || []).map{|path| service.volumes.all(:path => path).first }
         end
 
         def private_ip_address
@@ -146,9 +146,9 @@ module Fog
 
         def ssh_proxy
           # if this is a direct connection, we don't need a proxy to be set.
-          return nil unless @connection.uri.ssh_enabled?
-          user_string= connection.uri.user ? "-l #{connection.uri.user}" : ""
-          Net::SSH::Proxy::Command.new("ssh #{user_string} #{connection.uri.host} nc %h %p")
+          return nil unless connection.uri.ssh_enabled?
+          user_string= service.uri.user ? "-l #{service.uri.user}" : ""
+          Net::SSH::Proxy::Command.new("ssh #{user_string} #{service.uri.host} nc %h %p")
         end
 
         # Transfers a file
@@ -197,7 +197,7 @@ module Fog
         end
 
         def update_display attrs = {}
-          connection.update_display attrs.merge(:uuid => uuid)
+          service.update_display attrs.merge(:uuid => uuid)
           reload
         end
 
@@ -214,32 +214,32 @@ module Fog
         # It returns an array of public and private ip addresses
         # Currently only one ip address is returned, but in the future this could be multiple
         # if the server has multiple network interface
-        def addresses(connection=connection, options={})
+        def addresses(service=service, options={})
           mac=self.mac
 
           # Aug 24 17:34:41 juno arpwatch: new station 10.247.4.137 52:54:00:88:5a:0a eth0.4
           # Aug 24 17:37:19 juno arpwatch: changed ethernet address 10.247.4.137 52:54:00:27:33:00 (52:54:00:88:5a:0a) eth0.4
           # Check if another ip_command string was provided
-          ip_command_global=connection.ip_command.nil? ? 'grep $mac /var/log/arpwatch.log|sed -e "s/new station//"|sed -e "s/changed ethernet address//g" |sed -e "s/reused old ethernet //" |tail -1 |cut -d ":" -f 4-| cut -d " " -f 3' : connection.ip_command
+          ip_command_global=service.ip_command.nil? ? 'grep $mac /var/log/arpwatch.log|sed -e "s/new station//"|sed -e "s/changed ethernet address//g" |sed -e "s/reused old ethernet //" |tail -1 |cut -d ":" -f 4-| cut -d " " -f 3' : service.ip_command
           ip_command_local=options[:ip_command].nil? ? ip_command_global : options[:ip_command]
 
           ip_command="mac=#{mac}; server_name=#{name}; "+ip_command_local
 
           ip_address=nil
 
-          if connection.uri.ssh_enabled?
+          if service.uri.ssh_enabled?
 
-            # Retrieve the parts we need from the connection to setup our ssh options
-            user=connection.uri.user #could be nil
-            host=connection.uri.host
-            keyfile=connection.uri.keyfile
-            port=connection.uri.port
+            # Retrieve the parts we need from the service to setup our ssh options
+            user=service.uri.user #could be nil
+            host=service.uri.host
+            keyfile=service.uri.keyfile
+            port=service.uri.port
 
             # Setup the options
             ssh_options={}
             ssh_options[:keys]=[ keyfile ] unless keyfile.nil?
             ssh_options[:port]=port unless keyfile.nil?
-            ssh_options[:paranoid]=true if connection.uri.no_verify?
+            ssh_options[:paranoid]=true if service.uri.no_verify?
 
 
             begin
@@ -261,7 +261,7 @@ module Fog
 
           else
             # It's not ssh enabled, so we assume it is
-            if connection.uri.transport=="tls"
+            if service.uri.transport=="tls"
               raise Fog::Errors::Error.new("TlS remote transport is not currently supported, only ssh")
             end
 
@@ -310,15 +310,15 @@ module Fog
 
         def initialize_nics
           if nics
-            nics.map! { |nic| nic.is_a?(Hash) ? connection.nics.new(nic) : nic }
+            nics.map! { |nic| nic.is_a?(Hash) ? service.nics.new(nic) : nic }
           else
-            self.nics = [connection.nics.new({:type => network_interface_type, :bridge => network_bridge_name, :network => network_nat_network})]
+            self.nics = [service.nics.new({:type => network_interface_type, :bridge => network_bridge_name, :network => network_nat_network})]
           end
         end
 
         def initialize_volumes
           if attributes[:volumes] && !attributes[:volumes].empty?
-            @volumes = attributes[:volumes].map { |vol| vol.is_a?(Hash) ? connection.volumes.new(vol) : vol }
+            @volumes = attributes[:volumes].map { |vol| vol.is_a?(Hash) ? service.volumes.new(vol) : vol }
           end
         end
 
@@ -326,7 +326,7 @@ module Fog
           options = {:name => volume_name || default_volume_name}
           # Check if a disk template was specified
           if volume_template_name
-            template_volume = connection.volumes.all(:name => volume_template_name).first
+            template_volume = service.volumes.all(:name => volume_template_name).first
             raise Fog::Errors::Error.new("Template #{volume_template_name} not found") unless template_volume
             begin
               volume = template_volume.clone("#{options[:name]}")
@@ -335,12 +335,13 @@ module Fog
             end
           else
             # If no template volume was given, let's create our own volume
+            options[:pool_name]   = volume_pool_name   if volume_pool_name
             options[:format_type] = volume_format_type if volume_format_type
             options[:capacity]    = volume_capacity    if volume_capacity
             options[:allocation]  = volume_allocation  if volume_allocation
 
             begin
-              volume = connection.volumes.create(options)
+              volume = service.volumes.create(options)
             rescue => e
               raise Fog::Errors::Error.new("Error creating the volume : #{e}")
             end

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

@@ -10,11 +10,11 @@ module Fog
         model Fog::Compute::Libvirt::Server
 
         def all(filter={})
-          load(connection.list_domains(filter))
+          load(service.list_domains(filter))
         end
 
         def get(uuid)
-          data = connection.list_domains(:uuid => uuid)
+          data = service.list_domains(:uuid => uuid)
           new data.first if data
         end
 

data/lib/fog/libvirt/models/compute/volume.rb

@@ -38,17 +38,17 @@ module Fog
 
           raise Fog::Errors::Error.new('Reserving an existing volume may create a duplicate') if key
           @xml ||= to_xml
-          self.path = connection.create_volume(pool_name, xml).path
+          self.path = service.create_volume(pool_name, xml).path
         end
 
         # Destroy a volume
         def destroy
-          connection.volume_action key, :delete
+          service.volume_action key, :delete
         end
 
         # Wipes a volume , zeroes disk
         def wipe
-          connection.volume_action key, :wipe
+          service.volume_action key, :wipe
         end
 
         # Clones this volume to the name provided
@@ -75,10 +75,10 @@ module Fog
         # Try to guess the default/first pool of no pool_name was specified
         def default_pool_name
           name = "default"
-          return name unless (connection.pools.all(:name => name)).empty?
+          return name unless (service.pools.all(:name => name)).empty?
 
           # we default to the first pool we find.
-          first_pool = connection.pools.first
+          first_pool = service.pools.first
 
           raise Fog::Errors::Error.new('No storage pools are defined') unless first_pool
           first_pool.name

data/lib/fog/libvirt/models/compute/volumes.rb

@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Libvirt::Volume
 
         def all(filter = {})
-          load(connection.list_volumes(filter))
+          load(service.list_volumes(filter))
         end
 
         def get(key)

data/lib/fog/libvirt/requests/compute/list_domains.rb

@@ -58,7 +58,7 @@ module Fog
             :max_memory_size => dom.info.max_mem,
             :cputime         => dom.info.cpu_time,
             :memory_size     => dom.info.memory,
-            :vcpus           => dom.info.nr_virt_cpu,
+            :cpus            => dom.info.nr_virt_cpu,
             :autostart       => dom.autostart?,
             :os_type         => dom.os_type,
             :active          => dom.active?,
@@ -89,7 +89,7 @@ module Fog
               :max_memory_size => 8,
               :cputime         => 7,
               :memory_size     => 6,
-              :vcpus           => 5,
+              :cpus            => 5,
               :autostart       => false,
               :os_type         => "RHEL6",
               :active          => false,

data/lib/fog/linode/models/compute/data_centers.rb

@@ -13,9 +13,9 @@ module Fog
 
         private
         def datacenters(id=nil)
-          connection.avail_datacenters.body['DATA'].map { |datacenter| map_datacenter datacenter }
+          service.avail_datacenters.body['DATA'].map { |datacenter| map_datacenter datacenter }
         end
-        
+
         def map_datacenter(datacenter)
           datacenter = datacenter.each_with_object({}) { |(k, v), h| h[k.downcase.to_sym] = v  }
           datacenter.merge! :id => datacenter[:datacenterid], :name => datacenter[:location]

data/lib/fog/linode/models/compute/disk.rb

@@ -10,15 +10,15 @@ module Fog
 
         def save
           requires :server
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           @type, @image, @stack_script, @name, @password, @size =
             attributes.values_at :type, :image, :stack_script, :name, :password, :size
           create_disk
-        end        
+        end
 
         def destroy
           requires :identity, :server
-          connection.linode_disk_delete server.id, id
+          service.linode_disk_delete server.id, id
         end
 
         def server
@@ -40,18 +40,18 @@ module Fog
         end
 
         def create_disk_type
-          self.id = connection.linode_disk_create(server.id, "#{@name}_#{@type}", @type, @size).body['DATA']['DiskID']
+          self.id = service.linode_disk_create(server.id, "#{@name}_#{@type}", @type, @size).body['DATA']['DiskID']
           reload
         end
 
         def create_disk_from_image
-          disk = connection.linode_disk_createfromdistribution server.id, @image.id, "#{@name}_main", @size, @password
+          disk = service.linode_disk_createfromdistribution server.id, @image.id, "#{@name}_main", @size, @password
           self.id = disk.body['DATA']['DiskID']
           reload
-        end        
+        end
 
         def create_disk_from_stack_script
-          disk = connection.linode_disk_createfromstackscript(server.id, @stack_script.id, @image.id,
+          disk = service.linode_disk_createfromstackscript(server.id, @stack_script.id, @image.id,
                                                               "#{@name}_main", @size, @password, @stack_script.options)
           self.id = disk.body['DATA']['DiskID']
           reload

data/lib/fog/linode/models/compute/disks.rb

@@ -27,9 +27,9 @@ module Fog
 
         private
         def disks(linode_id, id=nil)
-          connection.linode_disk_list(linode_id, id).body['DATA'].map { |disk| map_disk disk }
+          service.linode_disk_list(linode_id, id).body['DATA'].map { |disk| map_disk disk }
         end
-        
+
         def map_disk(disk)
           disk = disk.each_with_object({}) { |(k, v), h| h[k.downcase.to_sym] = v  }
           disk.merge! :id => disk[:diskid], :name => disk[:label], :server_id => disk[:linodeid]

data/lib/fog/linode/models/compute/flavors.rb

@@ -19,9 +19,9 @@ module Fog
 
         private
         def flavors(id=nil)
-          connection.avail_linodeplans(id).body['DATA'].map { |flavor| map_flavor flavor }
+          service.avail_linodeplans(id).body['DATA'].map { |flavor| map_flavor flavor }
         end
-        
+
         def map_flavor(flavor)
           flavor = flavor.each_with_object({}) { |(k, v), h| h[k.downcase.to_sym] = v  }
           flavor.merge! :id => flavor[:planid], :name => flavor[:label]

data/lib/fog/linode/models/compute/images.rb

@@ -19,9 +19,9 @@ module Fog
 
         private
         def images(id=nil)
-          connection.avail_distributions(id).body['DATA'].map { |image| map_image image }
+          service.avail_distributions(id).body['DATA'].map { |image| map_image image }
         end
-        
+
         def map_image(image)
           image = image.each_with_object({}) { |(k, v), h| h[k.downcase.to_sym] = v  }
           image.merge!(:id => image[:distributionid], :name => image[:label], :image_size => image[:minimagesize],

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

@@ -10,9 +10,9 @@ module Fog
 
         def save
           requires :server
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
-          
-          connection.linode_ip_addprivate server.id
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
+
+          service.linode_ip_addprivate server.id
           server.ips.all.find { |ip| !ip.public }
         end
 

data/lib/fog/linode/models/compute/ips.rb

@@ -27,9 +27,9 @@ module Fog
 
         private
         def ips(linode_id, id=nil)
-          connection.linode_ip_list(linode_id, id).body['DATA'].map { |ip| map_ip ip }
+          service.linode_ip_list(linode_id, id).body['DATA'].map { |ip| map_ip ip }
         end
-        
+
         def map_ip(ip)
           ip = ip.each_with_object({}) { |(k, v), h| h[k.downcase.to_sym] = v  }
           ip.merge! :id => ip[:ipaddressid], :ip => ip[:ipaddress], :public => ip[:ispublic]==1

data/lib/fog/linode/models/compute/kernels.rb

@@ -19,9 +19,9 @@ module Fog
 
         private
         def kernels(id=nil)
-          connection.avail_kernels(id).body['DATA'].map { |kernel| map_kernel kernel }
+          service.avail_kernels(id).body['DATA'].map { |kernel| map_kernel kernel }
         end
-        
+
         def map_kernel(kernel)
           kernel = kernel.each_with_object({}) { |(k, v), h| h[k.downcase.to_sym] = v  }
           kernel.merge! :id => kernel[:kernelid], :name => kernel[:label]

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

@@ -15,7 +15,7 @@ module Fog
         end
 
         def ips
-          Fog::Compute::Linode::Ips.new :server => self, :connection => connection
+          Fog::Compute::Linode::Ips.new :server => self, :service => service
         end
 
         def public_ip_address
@@ -23,7 +23,7 @@ module Fog
         end
 
         def disks
-          Fog::Compute::Linode::Disks.new :server => self, :connection => connection
+          Fog::Compute::Linode::Disks.new :server => self, :service => service
         end
 
         def disks?
@@ -31,19 +31,19 @@ module Fog
         end
 
         def reboot
-          connection.linode_reboot id
+          service.linode_reboot id
         end
 
         def shutdown
-          connection.linode_shutdown id
+          service.linode_shutdown id
         end
 
         def boot
-          connection.linode_boot id, config
+          service.linode_boot id, config
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           @data_center, @flavor, @image, @kernel, @type, @payment_terms, @stack_script, @name, @password, @callback =
             attributes.values_at :data_center, :flavor, :image, :kernel, :type, :payment_terms, :stack_script, :name, :password, :callback
 
@@ -60,20 +60,20 @@ module Fog
 
         def destroy
           requires :identity
-          connection.linode_shutdown id
+          service.linode_shutdown id
           disks.each { |disk| disk.destroy }
           wait_for { not disks? }
-          connection.linode_delete id
+          service.linode_delete id
         end
 
         private
         def config
-          connection.linode_config_list(id).body['DATA'].first['ConfigID']
+          service.linode_config_list(id).body['DATA'].first['ConfigID']
         end
 
         def create_linode
-          self.id = connection.linode_create(@data_center.id, @flavor.id, @payment_terms).body['DATA']['LinodeID']
-          connection.linode_update id, :label => @name
+          self.id = service.linode_create(@data_center.id, @flavor.id, @payment_terms).body['DATA']['LinodeID']
+          service.linode_update id, :label => @name
           ips.create
           reload
         end
@@ -85,11 +85,11 @@ module Fog
         end
 
         def create_config
-          @config = connection.linode_config_create(id, @kernel.id, @name, "#{@disk.id},#{@swap.id},,,,,,,").body['DATA']['ConfigID']
+          @config = service.linode_config_create(id, @kernel.id, @name, "#{@disk.id},#{@swap.id},,,,,,,").body['DATA']['ConfigID']
         end
 
         def boot_linode
-          connection.linode_boot id, @config
+          service.linode_boot id, @config
         end
       end
     end