fog 1.35.0 → 1.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9d70adc0e2d4691ae0c52c21c326ef46cd7bff6
-  data.tar.gz: 88c2a0583be38c0c470191eb837cf90d7fe02c7f
+  metadata.gz: f9cedf56d775bede91d6a668e2f9914ca6c70ba0
+  data.tar.gz: 520ffb04055ee86be3f87d1b235e70e362cb1d58
 SHA512:
-  metadata.gz: 1657e1baa79242c845c9bed96dcb269de8c9b500bceb408ce31487af02103050bf5d56dd63e178705c0187f3dc83db2cf19a8245b64edbcbc4eba698bd046aa8
-  data.tar.gz: bbcf356f04b3f119edf2f43c389563f5170f55c4cb9e4a398d58b395cd5ebe3367e609e9f83520f8e1697a9d41954fa1ba1a9d8f98605799264674ef97a8aaca
+  metadata.gz: b58ecca0b95feb6a2a25295c3f218fc08b8f4f4cb198d4b6048684300ee74b4270e1ce666449c1974cca1b3fdaf1654a9408976bd21000228d5e061dbb1b8f0b
+  data.tar.gz: b0f5b97ad7da4e7926305cd71ca9f13bdfa94ea68f0c82a9cb65a8ffa882585320ee747d3544d18f089de4319f990170c5e10eca9820ba5bc4b0c16e7ad7eba2

data/.travis.yml

@@ -5,10 +5,12 @@ sudo: false
 script: bundle exec rake travis
 
 rvm:
+  - 1.9
   - 2.0
   - 2.1
   - 2.2
   - jruby-head
+  - jruby-19mode
 
 gemfile:
   - Gemfile

data/CHANGELOG.md

@@ -1,3 +1,53 @@
+## 1.36.0 11/16/2015
+*Hash* e7cd19696284633d4363993e2e3fda41384b7d58
+
+Statistic     | Value
+------------- | --------:
+Collaborators | 2
+Downloads     | 12793379
+Forks         | 1517
+Open Issues   | 92
+Watchers      | 3689
+
+**MVP!** Phil Ross
+
+#### [misc]
+*   added content-encoding meta-data. thanks ller
+*   version for fog-aliyun added in fog.gemspec. thanks Daniyal Shah
+*   Digital Ocean V2 call to create an ssh key returns a 201 on success: https://developers.digitalocean.com/documentation/v2/#create-a-new-key. thanks Dave Benvenuti
+*   improve mocks to more closely match real ssh key endpoint functionality. thanks Dave Benvenuti
+*   Fix issue when creating virtual machines with more than 7 disks. thanks Francois Herbert
+*   Fix distributed port group switches support for cloning with multiple networks. thanks as
+*   Extract virtualswitch parameter to the network model. thanks as
+*   fix openstack baremetal node delete. thanks Jason Montleon
+*   Fixed issue with OpenStack Auth v2. thanks ller
+*   Fix set node type for Rackspace load balancer. thanks Pablo Porto
+*   Add abbr attribute to Linode DataCenter. thanks Phil Ross
+*   Add created_at and requires_pvops_kernel to Linode Image model. thanks Phil Ross
+*   Update the Linode avail_kernels request and Kernel model. thanks Phil Ross
+*   Update the Linode avail_linodeplans request and Flavor model. thanks Phil Ross
+*   Add support for the Linode avail.nodebalancers API call. thanks Phil Ross
+*   Fix the signature of the Linode avail_stackscripts mock. thanks Phil Ross
+*   Use options on the all method to filter Linode kernels. thanks Phil Ross
+*   fix method call name in openstack node destroy so that it will work. thanks Stephen Herr
+*   vsphere: allow setting of boot order when using api > 5.0. thanks Timo Goebel
+*   Revert "temporarily relax ruby version constraint". thanks geemus
+*   make net/ssh require optional. thanks geemus
+*   re-add 1.9 to travis config. thanks geemus
+*   limit to 1.9 compat fog-google. thanks geemus
+*   1.8 compatibility for pre 2 release. thanks geemus
+
+#### [openstack]
+*   Basic caching support for auth tokens, domains & projects. thanks Darren Hague
+*   Re-record VCRs, plus some light refactoring. thanks Darren Hague
+
+#### [vsphere]
+*   add support for taking snapshot. thanks Ivo Reznicek
+*   support for snapshot list and revert. thanks Ivo Reznicek
+*   support for listing processes in guest OS. thanks Ivo Reznicek
+*   Prefer Class#name to Class#to_s. thanks Kevin Menard
+
+
 ## 1.35.0 10/20/2015
 *Hash* 4444f3287454a4281ead73fa24aa1b93d5d23a39
 

data/fog.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = "fog"
-  s.version           = "1.35.0"
-  s.date              = "2015-10-20"
+  s.version           = "1.36.0"
+  s.date              = "2015-11-16"
   s.rubyforge_project = "fog"
 
   ## Make sure your summary is short. The description may be as long
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
   s.add_dependency("fog-xml", "~> 0.1.1")
 
   s.add_dependency("ipaddress", "~> 0.5")
-  s.add_dependency("nokogiri")
+  s.add_dependency("nokogiri", "~> 1.5", ">= 1.5.11")
 
   # Modular providers (please keep sorted)
   s.add_dependency("fog-atmos")
@@ -57,7 +57,7 @@ Gem::Specification.new do |s|
   s.add_dependency("fog-brightbox", "~> 0.4")
   s.add_dependency("fog-dynect", "~> 0.0.2")
   s.add_dependency("fog-ecloud", "~> 0.1")
-  s.add_dependency("fog-google", ">= 0.1.1")
+  s.add_dependency("fog-google", "<= 0.1.0")
   s.add_dependency("fog-local")
   s.add_dependency("fog-powerdns", ">= 0.1.1")
   s.add_dependency("fog-profitbricks")
@@ -71,7 +71,7 @@ Gem::Specification.new do |s|
   s.add_dependency("fog-vmfusion")
   s.add_dependency("fog-voxel")
   s.add_dependency("fog-xenserver")
-  s.add_dependency("fog-aliyun")
+  s.add_dependency("fog-aliyun",">= 0.1.0")
 
   s.add_development_dependency("docker-api", ">= 1.13.6")
   s.add_development_dependency("fission")
@@ -90,7 +90,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rspec-core")
   s.add_development_dependency("rspec-expectations")
   s.add_development_dependency("vcr")
-  s.add_development_dependency("webmock")
+  s.add_development_dependency("webmock","~>1.22.2")
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {spec,tests}/*`.split("\n")

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

@@ -81,7 +81,6 @@ module Fog
 
         def setup(credentials = {})
           requires :ssh_ip_address
-          require 'net/ssh'
 
           commands = [
             %{mkdir .ssh},

data/lib/fog/digitalocean/requests/compute_v2/create_ssh_key.rb

@@ -13,7 +13,7 @@ module Fog
           encoded_body = Fog::JSON.encode(create_options)
 
           request(
-            :expects => [202],
+            :expects => [201],
             :headers => {
               'Content-Type' => "application/json; charset=UTF-8",
             },
@@ -28,15 +28,17 @@ module Fog
       class Mock
         def create_ssh_key(name, public_key)
           response        = Excon::Response.new
-          response.status = 202
+          response.status = 201
+
+          data[:ssh_keys] << {
+            "id" => Fog::Mock.random_numbers(6).to_i,
+            "fingerprint" => (["00"] * 16).join(':'),
+            "public_key" => public_key,
+            "name" => name
+          }
 
           response.body ={
-            'ssh_key' => {
-              'id'          => 512190,
-              'fingerprint' => "3b:16:bf:e4:8b:00:8b:b8:59:8c:a9:d3:f0:19:45:fa",
-              'public_key'  => "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAQQDDHr/jh2Jy4yALcK4JyWbVkPRaWmhck3IgCoeOO3z1e2dBowLh64QAM+Qb72pxekALga2oi4GvT+TlWNhzPH4V example",
-              'name'        => "My SSH Public Key"
-            }
+            'ssh_key' => data[:ssh_keys].last
           }
 
           response

data/lib/fog/digitalocean/requests/compute_v2/delete_ssh_key.rb

@@ -17,7 +17,11 @@ module Fog
 
       # noinspection RubyStringKeysInHashInspection
       class Mock
-        def delete_ssh_key(_)
+        def delete_ssh_key(id)
+          self.data[:ssh_keys].select! do |key|
+            key["id"] != id
+          end
+
           response        = Excon::Response.new
           response.status = 204
           response

data/lib/fog/digitalocean/requests/compute_v2/list_ssh_keys.rb

@@ -17,10 +17,15 @@ module Fog
           response = Excon::Response.new
           response.status = 200
           response.body = {
+            "ssh_keys" => data[:ssh_keys],
+            "links" => {},
+            "meta" => {
+              "total" => data[:ssh_keys].count
+            }
           }
           response
         end
       end
     end
   end
-end
+end

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

@@ -90,7 +90,6 @@ module Fog
 
         def setup(credentials = {})
           requires :ssh_ip_address, :username
-          require 'net/ssh'
 
           attrs = attributes.dup
           attrs.delete(:rootpassword)

data/lib/fog/joyent/compute.rb

@@ -1,6 +1,5 @@
 require 'fog/joyent/core'
 require 'fog/joyent/errors'
-require 'net/ssh'
 
 module Fog
   module Compute
@@ -126,6 +125,12 @@ module Fog
           end
 
           if options[:joyent_keyname]
+            begin
+              require "net/ssh"
+            rescue LoadError
+              Fog::Logger.warning("'net/ssh' missing, please install and try again.")
+              exit(1)
+            end
             @joyent_keyname = options[:joyent_keyname]
             @joyent_keyphrase = options[:joyent_keyphrase]
             @key_manager = Net::SSH::Authentication::KeyManager.new(nil, {

data/lib/fog/linode/compute.rb

@@ -23,12 +23,15 @@ module Fog
       collection :ips
       model :disk
       collection :disks
+      model :node_balancer_flavor
+      collection :node_balancer_flavors
 
       request_path 'fog/linode/requests/compute'
       request :avail_datacenters
       request :avail_distributions
       request :avail_kernels
       request :avail_linodeplans
+      request :avail_nodebalancers
       request :avail_stackscripts
       request :linode_disk_create
       request :linode_disk_list

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

@@ -6,6 +6,7 @@ module Fog
       class DataCenter < Fog::Model
         identity :id
         attribute :location
+        attribute :abbr
       end
     end
   end

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

@@ -8,8 +8,11 @@ module Fog
         attribute :disk
         attribute :name
         attribute :ram
+        attribute :transfer
         attribute :price
+        attribute :price_hourly
         attribute :cores
+        attribute :available
 
         def bits
           0 # these are determined by images you select not the hardware

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

@@ -24,7 +24,14 @@ module Fog
 
         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]
+          flavor.merge! :id => flavor[:planid], :name => flavor[:label],
+                        :transfer => flavor[:xfer], :price_hourly => flavor[:hourly],
+                        :available => map_available(flavor[:avail])
+        end
+
+        def map_available(available)
+          return nil unless available
+          available.each_with_object({}) { |(k, v), h| h[k.to_i] = v }
         end
       end
     end

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

@@ -8,6 +8,8 @@ module Fog
         attribute :name
         attribute :bits
         attribute :image_size
+        attribute :created_at, types: 'time'
+        attribute :requires_pvops_kernel
       end
     end
   end

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

@@ -25,7 +25,8 @@ module Fog
         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],
-                       :kernel_id => image[:requirespvopskernel], :bits => ((image[:is64bit] == 1) ? 64 : 32 ))
+                       :requires_pvops_kernel => image[:requirespvopskernel], :bits => ((image[:is64bit] == 1) ? 64 : 32 ),
+                       :created_at => image[:create_dt])
         end
       end
     end

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

@@ -6,6 +6,9 @@ module Fog
       class Kernel < Fog::Model
         identity :id
         attribute :name
+        attribute :is_xen
+        attribute :is_kvm
+        attribute :is_pvops
       end
     end
   end

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

@@ -7,24 +7,30 @@ module Fog
       class Kernels < Fog::Collection
         model Fog::Compute::Linode::Kernel
 
-        def all
-          load kernels
+        # Returns an Array of the available kernels.
+        #
+        # The list of kernels can be filtered by support for KVM or Xen by
+        # specifying kvm: true or xen: true respectively as options.
+        def all(options={})
+          [[:kvm, :isKVM], [:xen, :isXen]].each do |type, param|
+            options[param] = options[type] ? 1 : 0 if options.has_key?(type)
+          end
+          load kernels(options)
         end
 
         def get(id)
-          new kernels(id).select {|kernel| kernel[:id] == id }.first
-        rescue Fog::Compute::Linode::NotFound
-          nil
+          new kernels.select {|kernel| kernel[:id] == id }.first
         end
 
         private
-        def kernels(id=nil)
-          service.avail_kernels(id).body['DATA'].map { |kernel| map_kernel kernel }
+        def kernels(options={})
+          service.avail_kernels(options).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]
+          kernel.merge! :id => kernel[:kernelid], :name => kernel[:label],
+                        :is_xen => kernel[:isxen], :is_kvm => kernel[:iskvm], :is_pvops => kernel[:ispvops]
         end
       end
     end

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

@@ -0,0 +1,13 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class Linode
+      class NodeBalancerFlavor < Fog::Model
+        attribute :price_monthly
+        attribute :price_hourly
+        attribute :connections
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+require 'fog/core/collection'
+require 'fog/linode/models/compute/node_balancer_flavor'
+
+module Fog
+  module Compute
+    class Linode
+      class NodeBalancerFlavors < Fog::Collection
+        model Fog::Compute::Linode::NodeBalancerFlavor
+
+        def all
+          load node_balancer_flavors
+        end
+
+        private
+        def node_balancer_flavors
+          service.avail_nodebalancers.body['DATA'].map { |node_balancer_flavor| map_node_balancer_flavor node_balancer_flavor }
+        end
+
+        def map_node_balancer_flavor(node_balancer_flavor)
+          node_balancer_flavor = node_balancer_flavor.each_with_object({}) { |(k, v), h| h[k.downcase.to_sym] = v  }
+          node_balancer_flavor.merge! :price_monthly => node_balancer_flavor[:monthly],
+                                      :price_hourly => node_balancer_flavor[:hourly]
+        end
+      end
+    end
+  end
+end

data/lib/fog/linode/requests/compute/avail_kernels.rb

@@ -5,27 +5,30 @@ module Fog
         # Get available kernels
         #
         # ==== Parameters
-        # * kernelId<~Integer>: id to limit results to
+        # * options<~Hash>
+        #   * isXen<~Boolean> Show or hide Xen compatible kernels
+        #   * isKVM<~Boolean> Show or hide KVM compatible kernels
         #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Array>:
         # TODO: docs
-        def avail_kernels(kernel_id=nil)
-          options = {}
-          if kernel_id
-            options.merge!(:kernelId => kernel_id)
-          end
+        def avail_kernels(options={})
+          # avail.kernels used to accept a kernelId parameter (now removed)
+          raise Fog::Errors::Error.new('avail_kernels no longer accepts a kernelId parameter') unless !options || options.is_a?(Hash)
           request(
             :expects  => 200,
             :method   => 'GET',
-            :query    => { :api_action => 'avail.kernels' }.merge!(options)
+            :query    => { :api_action => 'avail.kernels' }.merge!(options || {})
           )
         end
       end
 
       class Mock
-        def avail_kernels(kernel_id=nil)
+        def avail_kernels(options={})
+          # avail.kernels used to accept a kernelId parameter (now removed)
+          raise Fog::Errors::Error.new('avail_kernels no longer accepts a kernelId parameter') unless !options || options.is_a?(Hash)
+
           response = Excon::Response.new
           response.status = 200
 
@@ -33,17 +36,12 @@ module Fog
             "ERRORARRAY" => [],
             "ACTION" => "avail.kernels"
           }
-          if kernel_id
-            mock_kernel = create_mock_kernel(kernel_id)
-            response.body = body.merge("DATA" => [mock_kernel])
-          else
-            mock_kernels = []
-            10.times do
-              kernel_id = rand(1..200)
-              mock_kernels << create_mock_kernel(kernel_id)
-            end
-            response.body = body.merge("DATA" => mock_kernels)
+          mock_kernels = []
+          10.times do
+            kernel_id = rand(1..200)
+            mock_kernels << create_mock_kernel(kernel_id)
           end
+          response.body = body.merge("DATA" => mock_kernels)
           response
         end
 
@@ -53,6 +51,7 @@ module Fog
           {
             "ISPVOPS"  => 1,
             "ISXEN"    => 1,
+            "ISKVM"    => 1,
             "KERNELID" => kernel_id,
             "LABEL"    => "Latest 3.0 (3.0.18-linode43)"
           }