fog 1.36.0 → 1.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9cedf56d775bede91d6a668e2f9914ca6c70ba0
-  data.tar.gz: 520ffb04055ee86be3f87d1b235e70e362cb1d58
+  metadata.gz: 738eb34cd16f667cbcace3db1cd5b9ecf43b2523
+  data.tar.gz: d59b0584e317418f4ac05f407742325d58023791
 SHA512:
-  metadata.gz: b58ecca0b95feb6a2a25295c3f218fc08b8f4f4cb198d4b6048684300ee74b4270e1ce666449c1974cca1b3fdaf1654a9408976bd21000228d5e061dbb1b8f0b
-  data.tar.gz: b0f5b97ad7da4e7926305cd71ca9f13bdfa94ea68f0c82a9cb65a8ffa882585320ee747d3544d18f089de4319f990170c5e10eca9820ba5bc4b0c16e7ad7eba2
+  metadata.gz: 87d75d2c9fe6bf483461cf2e675ef78a607b9755ab0135cea41afddb043923eec526dd9412641d34d6b4fff7b20e66f0a6000c354f85d473bd17d2e3741d490a
+  data.tar.gz: 78b931fa6b3fd7cb5f839c3b33001f8d98dfc5f7c50dda0bf05d06298e0cc3e5afd33400baf7e965ae98aa145b7f3fda12b78c0a48678f4fb998228a15a2bc86

data/CHANGELOG.md

@@ -1,3 +1,64 @@
+## 1.37.0 12/22/2015
+*Hash* f7cf6b7c6499ab2a58bb7fe6848363d7cc459d3a
+
+Statistic     | Value
+------------- | --------:
+Collaborators | 2
+Downloads     | 13380838
+Forks         | 1530
+Open Issues   | 89
+Watchers      | 3729
+
+**MVP!** Rich Daley
+
+#### [misc]
+*   Remove vSphere provider. thanks  Garcia
+*   Remove lib/fog/bin/vsphere. thanks  Garcia
+*   Use fog-vsphere ~> 0.2. thanks  Garcia
+*   OpenStack fix Cinder v2 typo. thanks Ladislav Smola
+*   OpenStack add server evacuate action. thanks Ladislav Smola
+*   Fix DigitalOceanV2::SshKey misplaced #save, #destroy and #update methods. thanks Manuel Franco
+*   Enforce no slash in container name. thanks Matt Darby
+*   Update API path for deleting SSH keys. thanks Michael Borohovski
+*   Upgrade version of fog-vsphere to 0.4. Fixes #3784. thanks Michael Borohovski
+*   Updates Getting Started for DigitalOcean. thanks Peter Souter
+*   Add some mocks for VM (partial) and Network. thanks Rich Daley
+*   Add loads more mocks to the vcloud_director backend. thanks Rich Daley
+*   Add mocks for disks. thanks Rich Daley
+*   Add mock support for tags. thanks Rich Daley
+*   Don't pass AdminPassword if AdminPasswordAuto is true (causes an exception). thanks Rich Daley
+*   Remove erroneous file. thanks Rich Daley
+*   Add a barebones :post_reconfigure_vm and a Vm#reconfigure that uses it. thanks Rich Daley
+*   Add a mock and fix infinite loop issue. thanks Rich Daley
+*   Set description in the mocks ahead of separate PR. thanks Rich Daley
+*   Add support for VM descriptions. thanks Rich Daley
+*   Add a #storage_only to disks to return only those disks that are actually disks. thanks Rich Daley
+*   Remove description if it hasn't changed. thanks Rich Daley
+*   Make comment more explicit about OVF. thanks Rich Daley
+*   Add vdc.networks. thanks Rich Daley
+*   Fix bogus requires. thanks Rich Daley
+*   Add a mock for put_network_connection_system_section_vapp and fix the mock for get_vm_network to get the VM ID the same way the parser does. thanks Rich Daley
+*   Add mock for post_power_on_vapp. thanks Rich Daley
+*   Add mock for delete_vapp. thanks Rich Daley
+*   According to doc, only the username is mandatory. thanks Sean Handley
+*   If the management URL has no path, use the one in the auth URI. thanks Sean Handley
+*   Revert "If the management URL has no path, use the one in the auth URI.". thanks Sean Handley
+*   Workaround for installs using both v2 and v3. thanks Sean Handley
+*   Fix #3785 Missing image details for digitalocean version 2 api. thanks Suraj Shirvankar
+*   Added method locked? to check if the machine is currently locked with     another operation. thanks Suraj Shirvankar
+*   Add openstack_temp_url_key to the list of recognized options. thanks Yauheni Kryudziuk
+*   rely on fog-xml nokogiri dep. thanks geemus
+*   add mime-types as dev dependency. thanks geemus
+*   Update compute.md. thanks losingle
+
+#### [openstack]
+*   volume API v2 implementation. thanks Darren Hague
+*   Revert over-eager optimisation in v2 authentication case. thanks Darren Hague
+
+#### [rackspace]
+*   Add support for get_vnc_console request to compute_v2. thanks Dusty Jones
+
+
 ## 1.36.0 11/16/2015
 *Hash* e7cd19696284633d4363993e2e3fda41384b7d58
 

data/Rakefile

@@ -69,9 +69,6 @@ namespace :test do
   task :travis => [:openstack_specs] do
       sh("export FOG_MOCK=#{mock} && bundle exec shindont")
   end
-  task :vsphere do
-      sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/vsphere")
-  end
   task :openvz do
       sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/openvz")
   end

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.36.0"
-  s.date              = "2015-11-16"
+  s.version           = "1.37.0"
+  s.date              = "2015-12-22"
   s.rubyforge_project = "fog"
 
   ## Make sure your summary is short. The description may be as long
@@ -49,7 +49,6 @@ Gem::Specification.new do |s|
   s.add_dependency("fog-xml", "~> 0.1.1")
 
   s.add_dependency("ipaddress", "~> 0.5")
-  s.add_dependency("nokogiri", "~> 1.5", ">= 1.5.11")
 
   # Modular providers (please keep sorted)
   s.add_dependency("fog-atmos")
@@ -70,11 +69,13 @@ Gem::Specification.new do |s|
   s.add_dependency("fog-terremark")
   s.add_dependency("fog-vmfusion")
   s.add_dependency("fog-voxel")
+  s.add_dependency("fog-vsphere", ">= 0.4.0")
   s.add_dependency("fog-xenserver")
   s.add_dependency("fog-aliyun",">= 0.1.0")
 
   s.add_development_dependency("docker-api", ">= 1.13.6")
   s.add_development_dependency("fission")
+  s.add_development_dependency("mime-types")
   s.add_development_dependency("minitest")
   s.add_development_dependency("minitest-stub-const")
   s.add_development_dependency("opennebula")

data/lib/fog/digitalocean/compute_v2.rb

@@ -27,6 +27,7 @@ module Fog
       request :enable_ipv6
       request :enable_private_networking
       request :get_droplet_action
+      request :get_image_details
       request :get_server_details
       request :get_ssh_key
       request :list_droplet_actions
@@ -105,4 +106,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/digitalocean/examples/getting_started.md

@@ -1,11 +1,10 @@
 # Getting started: the compute service
 
-You'll need a DigitalOcean account and API key to use this provider.
+You'll need a DigitalOcean account and an API token to use this provider.
 
-Get one from https://cloud.digitalocean.com/api_access (fog currently uses the v1 API)
-
-Write down the Client Key and API Key, you'll need both to use the service.
+Get one from https://cloud.digitalocean.com/settings/tokens/new
 
+Write down the Access Token.
 
 ## Connecting, retrieving and managing server objects
 
@@ -21,8 +20,8 @@ require 'fog'
 
 docean = Fog::Compute.new({
   :provider => 'DigitalOcean',
-  :digitalocean_api_key   => 'poiuweoruwoeiuroiwuer', # your API key here
-  :digitalocean_client_id => 'lkjasoidfuoiu'          # your client key here
+  :version  => 'V2',
+  :digitalocean_token   => 'poiuweoruwoeiuroiwuer', # your Access Token here
 })
 ```
 
@@ -43,8 +42,9 @@ Listing all keys:
 
 ```ruby
 docean.ssh_keys.each do | key |
-   key.name
-   key.ssh_pub_key
+  puts key.name
+  puts key.public_key
+  puts key.id
 end
 ```
 
@@ -53,24 +53,6 @@ Destroying a key:
 ```ruby
 docean.ssh_keys.destroy(:id => '27100')
 ```
-
-## Boostrapping a server
-
-Fog can be used to bootstrap a server, which will create an SSH key to be assigned to a server at boot.
-
-```ruby
-server = connection.servers.bootstrap({
-  :name => 'test',
-  :image_id => 1505447,
-  :size_id => 33,
-  :region_id => 4,
-  :flavor_id => 66,
-  :public_key_path => File.expand_path('~/.ssh/id_rsa.pub'),
-  :private_key_path => File.expand_path('~/.ssh/id_rsa'),
-})
-server.wait_for { ready? }
-```
-
 ## Listing servers
 
 Listing servers and attributes:
@@ -78,13 +60,12 @@ Listing servers and attributes:
 ```ruby
 docean.servers.each do |server|
   # remember, servers are droplets
-  server.id
-  server.name
-  server.state
-  server.backups_enabled
-  server.image_id
-  server.flavor_id # server 'size' in DigitalOcean's API parlance
-  server.region_id
+  puts server.id
+  puts server.name
+  puts server.status
+  puts (server.image['slug'] || server.image['name']) # slug is only for public images, private images use name
+  puts server.size['slug']
+  puts server.region['slug']
 end
 ```
 
@@ -94,12 +75,12 @@ Creating a new server (droplet):
 
 ```ruby
 server = docean.servers.create :name => 'foobar',
-                               # use the first image listed
-                               :image_id  => docean.images.first.id,
-                               # use the first flavor listed
-                               :flavor_id => docean.flavors.first.id,
+                               # use the last image listed
+                               :image  => docean.images.last.id,
+                               # use the first flavor (aka size) listed
+                               :size => docean.flavors.first.slug,
                                # use the first region listed
-                               :region_id => docean.regions.first.id
+                               :region => docean.regions.first.slug
 ```
 
 The server is automatically started after that.
@@ -109,21 +90,18 @@ but you can easily list them too, and then decide:
 
 ```ruby
 docean.images.each do |image|
-  image.id
-  image.name
-  image.distribution
+  puts image.id
+  puts image.name
+  puts image.distribution
 end
 
 docean.flavors.each do |flavor|
-  flavor.id
-  flavor.name
+  puts flavor.slug
 end
 
 docean.regions.each do |region|
-  region.id
-  region.name
+  puts region.slug
 end
-
 ```
 
 Rebooting a server:
@@ -144,5 +122,3 @@ Destroying the server:
 ```ruby
 server.destroy
 ```
-
-

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

@@ -76,6 +76,10 @@ module Fog
           status == 'active'
         end
 
+        def locked?
+          locked
+        end
+
         def actions
           requires :id
           response = service.list_droplet_actions id

data/lib/fog/digitalocean/models/compute_v2/ssh_key.rb

@@ -6,25 +6,26 @@ module Fog
         attribute :fingerprint
         attribute :public_key
         attribute :name
-      end
 
-      def save
-        requires :name, :public_key
-        merge_attributes(service.create_ssh_key(name, public_key).body['ssh_key'])
-        true
-      end
+        def save
+          requires :name, :public_key
+          merge_attributes(service.create_ssh_key(name, public_key).body['ssh_key'])
+          true
+        end
 
-      def destroy
-        requires :id
-        service.delete_ssh_key id
-      end
+        def destroy
+          requires :id
+          service.delete_ssh_key id
+        end
+
+        def update
+          requires :id, :name
+          data = service.update_server(id, name)
+          merge_attributes(data.body['ssh_key'])
+          true
+        end
 
-      def update
-        requires :id, :name
-        data = service.update_server(id, name)
-        merge_attributes(data.body['ssh_key'])
-        true
       end
     end
   end
-end
+end

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

@@ -10,7 +10,7 @@ module Fog
               'Content-Type' => "application/json; charset=UTF-8",
             },
             :method  => 'DELETE',
-            :path    => "/v2/account/keys#{id}",
+            :path    => "/v2/account/keys/#{id}",
           )
         end
       end

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

@@ -6,7 +6,7 @@ module Fog
           request(
             :expects => [200],
             :method  => 'GET',
-            :path    => "/v2/images/#{server_id}"
+            :path    => "/v2/images/#{image_id}"
           )
         end
       end
@@ -33,7 +33,6 @@ module Fog
                 'min_disk_size' => 20
               }
             }
-          }
 
           response
         end

data/lib/fog/openstack.rb

@@ -9,5 +9,7 @@ require 'fog/openstack/network'
 require 'fog/openstack/orchestration'
 require 'fog/openstack/storage'
 require 'fog/openstack/volume'
+require 'fog/openstack/volume_v1'
+require 'fog/openstack/volume_v2'
 require 'fog/openstack/baremetal'
 require 'fog/openstack/planning'

data/lib/fog/openstack/common.rb

@@ -0,0 +1,46 @@
+require 'fog/openstack/core'
+
+module Fog
+  module OpenStack
+    module Common
+      attr_reader :unscoped_token
+
+      include Fog::OpenStack::Core
+
+      def request(params)
+        retried = false
+        begin
+          std_headers   = {
+              'Content-Type' => 'application/json',
+              'Accept'       => 'application/json',
+              'X-Auth-Token' => @auth_token
+          }
+          param_headers = params.fetch(:headers, {})
+
+          response = @connection.request(params.merge({
+                                                          :headers => std_headers.merge(param_headers),
+                                                          :path    => "#{@path}/#{params[:path]}"
+                                                      }))
+        rescue Excon::Errors::Unauthorized => error
+          raise if retried
+          retried = true
+
+          @openstack_must_reauthenticate = true
+          authenticate
+          retry
+        rescue Excon::Errors::HTTPStatusError => error
+          raise case error
+                  when Excon::Errors::NotFound
+                    self.class.not_found_class.slurp(error)
+                  else
+                    error
+                end
+        end
+        unless response.body.empty?
+          response.body = Fog::JSON.decode(response.body) unless params[:raw_body]
+        end
+        response
+      end
+    end
+  end
+end

data/lib/fog/openstack/compute.rb

@@ -12,7 +12,8 @@ module Fog
                  :openstack_endpoint_type,
                  :openstack_project_name, :openstack_project_id,
                  :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
-                 :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id
+                 :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,
+                 :openstack_identity_prefix
 
       ## MODELS
       #
@@ -105,6 +106,7 @@ module Fog
       request :get_vnc_console
       request :live_migrate_server
       request :migrate_server
+      request :evacuate_server
 
       # Service CRUD
       request :list_services

data/lib/fog/openstack/core.rb

@@ -67,6 +67,7 @@ module Fog
       attr_reader :openstack_domain_id
       attr_reader :openstack_user_domain_id
       attr_reader :openstack_project_domain_id
+      attr_reader :openstack_identity_prefix
 
       def initialize_identity options
         # Create @openstack_* instance variables from all :openstack_* options
@@ -154,6 +155,13 @@ module Fog
         @port   = @openstack_management_uri.port
         @scheme = @openstack_management_uri.scheme
 
+        # Not all implementations have identity service in the catalog
+        if @openstack_identity_public_endpoint || @openstack_management_url
+          @identity_connection = Fog::Core::Connection.new(
+              @openstack_identity_public_endpoint || @openstack_management_url,
+              false, @connection_options)
+        end
+
         true
       end
     end
@@ -409,7 +417,7 @@ module Fog
       auth_token  = options[:openstack_auth_token] || options[:unscoped_token]
       uri         = options[:openstack_auth_uri]
 
-      @identity_connection = Fog::Core::Connection.new(uri.to_s, false, connection_options)
+      identity_v2_connection = Fog::Core::Connection.new(uri.to_s, false, connection_options)
       request_body = {:auth => Hash.new}
 
       if auth_token
@@ -424,7 +432,7 @@ module Fog
       end
       request_body[:auth][:tenantName] = tenant_name if tenant_name
 
-      response = @identity_connection.request({
+      response = identity_v2_connection.request({
         :expects  => [200, 204],
         :headers  => {'Content-Type' => 'application/json'},
         :body     => Fog::JSON.encode(request_body),
@@ -574,7 +582,11 @@ module Fog
     end
 
     def self.get_supported_version_path(supported_versions, uri, auth_token, connection_options = {})
-      connection = Fog::Core::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}", false, connection_options)
+      # Find a version in the path (e.g. the v1 in /xyz/v1/tenantid/abc) and get the path up until that version (e.g. /xyz))
+      path_components = uri.path.split '/'
+      version_component_index = path_components.index{|comp| comp.match(/v[0-9].?[0-9]?/) }
+      versionless_path = (path_components.take(version_component_index).join '/' if version_component_index) || ''
+      connection = Fog::Core::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}#{versionless_path}", false, connection_options)
       response = connection.request({
                                         :expects => [200, 204, 300],
                                         :headers => {'Content-Type' => 'application/json',