fog 1.10.1 → 1.11.0

data/lib/fog/openstack/network.rb

@@ -3,6 +3,7 @@ require 'fog/openstack'
 module Fog
   module Network
     class OpenStack < Fog::Service
+      SUPPORTED_VERSIONS = /v2(\.0)*/
 
       requires :openstack_auth_url
       recognizes :openstack_auth_token, :openstack_management_url, :persistent,
@@ -112,8 +113,6 @@ module Fog
         attr_reader :current_tenant
 
         def initialize(options={})
-          require 'multi_json'
-
           @openstack_auth_token = options[:openstack_auth_token]
 
           unless @openstack_auth_token
@@ -168,8 +167,6 @@ module Fog
               }.merge!(params[:headers] || {}),
               :host     => @host,
               :path     => "#{@path}/#{params[:path]}"#,
-              # Causes errors for some requests like tenants?limit=1
-              # :query    => ('ignore_awful_caching' << Time.now.to_i.to_s)
             }))
           rescue Excon::Errors::Unauthorized => error
             if error.response.body != 'Bad username or password' # token expiration
@@ -188,7 +185,7 @@ module Fog
             end
           end
           unless response.body.empty?
-            response.body = MultiJson.decode(response.body)
+            response.body = Fog::JSON.decode(response.body)
           end
           response
         end
@@ -225,35 +222,17 @@ module Fog
           @host   = uri.host
           @path   = uri.path
           @path.sub!(/\/$/, '')
-          unless @path.match(/^\/v(\d)+(\.)?(\d)*$/)
-            @path = "/" + retrieve_current_version(uri)
+          unless @path.match(SUPPORTED_VERSIONS)
+            @path = "/" + Fog::OpenStack.get_supported_version(SUPPORTED_VERSIONS,
+                                                               uri,
+                                                               @auth_token,
+                                                               @connection_options)
           end
           @port   = uri.port
           @scheme = uri.scheme
           true
         end
 
-        def retrieve_current_version(uri)
-          response = Fog::Connection.new(
-            "#{uri.scheme}://#{uri.host}:#{uri.port}", false, @connection_options).request({
-              :expects => [200, 204],
-              :headers => {'Content-Type' => 'application/json',
-                           'Accept' => 'application/json',
-                           'X-Auth-Token' => @auth_token},
-              :host    => uri.host,
-              :method  => 'GET'
-          })
-
-          body = Fog::JSON.decode(response.body)
-          version = nil
-          unless body['versions'].empty?
-            current_version = body['versions'].detect { |x| x["status"] == "CURRENT" }
-            version = current_version["id"]
-          end
-          raise Errors::NotFound.new('No API versions found') if version.nil?
-          version
-        end
-
       end
     end
   end

data/lib/fog/openstack/requests/compute/allocate_address.rb

@@ -6,7 +6,7 @@ module Fog
         def allocate_address(pool = nil)
 
           request(
-            :body     => MultiJson.encode({'pool' => pool}),
+            :body     => Fog::JSON.encode({'pool' => pool}),
             :expects  => [200, 202],
             :method   => 'POST',
             :path     => 'os-floating-ips.json'

data/lib/fog/openstack/requests/compute/attach_volume.rb

@@ -11,7 +11,7 @@ module Fog
             }
           }
           request(
-            :body     => MultiJson.encode(data),
+            :body     => Fog::JSON.encode(data),
             :expects  => [200, 202],
             :method   => 'POST',
             :path     => "servers/%s/os-volume_attachments" % [server_id]
@@ -21,16 +21,21 @@ module Fog
       end
 
       class Mock
+
         def attach_volume(volume_id, server_id, device)
           response = Excon::Response.new
           response.status = 200
-          response.body ={ "volumeAttachment" => {
-                             "id"       => volume_id,
-                             "volumeId" => volume_id
-                            }
-                         }
+          data = {
+             'id'       => volume_id,
+             'volumeId' => volume_id,
+             'serverId' => server_id,
+             'device'   => device
+          }
+          self.data[:volumes][volume_id]['attachments'] << data
+          response.body = { 'volumeAttachment' => data }
           response
         end
+
       end
 
     end

data/lib/fog/openstack/requests/compute/boot_from_snapshot.rb

@@ -29,7 +29,7 @@ module Fog
           end
 
           request(
-            :body     => MultiJson.encode(data),
+            :body     => Fog::JSON.encode(data),
             :expects  => [200, 202],
             :method   => 'POST',
             :path     => '/os-volumes_boot.json'

data/lib/fog/openstack/requests/compute/create_flavor.rb

@@ -35,7 +35,7 @@ module Fog
           }
 
           request(
-            :body => MultiJson.encode(data),
+            :body => Fog::JSON.encode(data),
             :expects => 200,
             :method => 'POST',
             :path => 'flavors'

data/lib/fog/openstack/requests/compute/create_key_pair.rb

@@ -14,7 +14,7 @@ module Fog
           data['keypair']['public_key'] = public_key unless public_key.nil?
 
           request(
-            :body     => MultiJson.encode(data),
+            :body     => Fog::JSON.encode(data),
             :expects  => 200,
             :method   => 'POST',
             :path     => 'os-keypairs.json'

data/lib/fog/openstack/requests/compute/create_security_group.rb

@@ -12,7 +12,7 @@ module Fog
           }
 
           request(
-            :body     => MultiJson.encode(data),
+            :body     => Fog::JSON.encode(data),
             :expects  => 200,
             :method   => 'POST',
             :path     => 'os-security-groups.json'

data/lib/fog/openstack/requests/compute/create_security_group_rule.rb

@@ -18,7 +18,7 @@ module Fog
           request(
             :expects  => 200,
             :method   => 'POST',
-            :body     => MultiJson.encode(data),
+            :body     => Fog::JSON.encode(data),
             :path     => 'os-security-group-rules.json'
           )
         end

data/lib/fog/openstack/requests/compute/create_volume.rb

@@ -17,7 +17,7 @@ module Fog
             data['volume'][key] = options[key]
           end
           request(
-            :body     => MultiJson.encode(data),
+            :body     => Fog::JSON.encode(data),
             :expects  => [200, 202],
             :method   => 'POST',
             :path     => "os-volumes"
@@ -31,22 +31,23 @@ module Fog
         def create_volume(name, description, size, options={})
           response = Excon::Response.new
           response.status = 202
-          response.body = {
-            'volume' => {
-              'id'                  => Fog::Mock.random_numbers(2),
-              'display_name'        => name,
-              'display_description' => description,
-              'size'                => size,
-              'status'              => 'creating',
-              'snapshot_id'         => '4',
-              'volume_type'         => nil,
-              'availability_zone'   => 'nova',
-              'created_at'          => Time.now,
-              'attachments'          => []
-            }
+          data = {
+            'id'                  => Fog::Mock.random_numbers(2),
+            'name'                => name,
+            'description'         => description,
+            'size'                => size,
+            'status'              => 'creating',
+            'snapshot_id'         => '4',
+            'volume_type'         => nil,
+            'availability_zone'   => 'nova',
+            'created_at'          => Time.now,
+            'attachments'         => []
           }
+          self.data[:volumes][data['id']] = data
+          response.body = { 'volume' => data }
           response
         end
+
       end
 
     end

data/lib/fog/openstack/requests/compute/create_volume_snapshot.rb

@@ -14,7 +14,7 @@ module Fog
           }
 
           request(
-            :body     => MultiJson.encode(data),
+            :body     => Fog::JSON.encode(data),
             :expects  => [200, 202],
             :method   => 'POST',
             :path     => "os-snapshots"

data/lib/fog/openstack/requests/compute/delete_volume.rb

@@ -14,11 +14,18 @@ module Fog
       end
 
       class Mock
+
         def delete_volume(volume_id)
           response = Excon::Response.new
-          response.status = 204
-          response
+          if list_volumes.body['volumes'].map { |v| v['id'] }.include? volume_id
+            self.data[:volumes].delete(volume_id)
+            response.status = 204
+            response
+          else
+            raise Fog::Compute::OpenStack::NotFound
+          end
         end
+
       end
 
     end

data/lib/fog/openstack/requests/compute/detach_volume.rb

@@ -14,10 +14,15 @@ module Fog
       end
 
       class Mock
+
         def detach_volume(server_id, attachment_id)
           response = Excon::Response.new
-          response.status = 202
-          response
+          if self.data[:volumes][attachment_id]['attachments'].reject! { |attachment| attachment['serverId'] == server_id }
+            response.status = 202
+            response
+          else
+            raise Fog::Compute::OpenStack::NotFound
+          end
         end
       end
 

data/lib/fog/openstack/requests/compute/get_server_volumes.rb

@@ -16,6 +16,16 @@ module Fog
 
       class Mock
 
+        def get_server_volumes(server_id)
+          response = Excon::Response.new
+          response.status = 200
+          data = self.data[:volumes].values.find_all do |vol|
+            vol['attachments'].find { |attachment| attachment["serverId"] == server_id }
+          end
+          response.body = { 'volumeAttachments' => data.collect! { |vol| vol['attachments'] }.flatten(1) }
+          response
+        end
+
       end
 
     end

data/lib/fog/openstack/requests/compute/get_volume_details.rb

@@ -18,22 +18,13 @@ module Fog
 
         def get_volume_details(volume_id)
           response = Excon::Response.new
-          response.status = 200
-          response.body = {
-            'volume' => {
-              'id'                  => '1',
-              'display_name'        => Fog::Mock.random_letters(rand(8) + 5),
-              'display_description' => Fog::Mock.random_letters(rand(12) + 10),
-              'size'                => 3,
-              'volume_type'         => nil,
-              'snapshot_id'         => '4',
-              'status'              => 'online',
-              'availability_zone'   => 'nova',
-              'created_at'          => Time.now,
-              'attachments'         => []
-            }
-          }
-          response
+          if data = self.data[:volumes][volume_id]
+            response.status = 200
+            response.body = { 'volume' => data }
+            response
+          else
+            raise Fog::Compute::OpenStack::NotFound
+          end
         end
       end
 

data/lib/fog/openstack/requests/compute/list_tenants.rb

@@ -11,7 +11,7 @@ module Fog
             :method  => 'GET',
             :path    => '/v2.0/tenants'
           })
-          response.body = MultiJson.decode(response.body)
+          response.body = Fog::JSON.decode(response.body)
           response
         end
       end

data/lib/fog/openstack/requests/compute/list_volumes.rb

@@ -17,32 +17,10 @@ module Fog
       class Mock
 
         def list_volumes(detailed=true)
-          response = Excon::Response.new
-          response.status = 200
-          self.data[:volumes] ||= [
-            { "status" => "available",
-              "display_description" => "",
-              "availability_zone" => "nova",
-              "display_name" => "test 1",
-              "attachments" => [{}],
-              "volume_type" => nil,
-              "snapshot_id" => nil,
-              "size" => 1,
-              "id" => Fog::Mock.random_hex(32),
-              "created_at" => Time.now },
-            { "status" => "available",
-              "display_description" => "",
-              "availability_zone" => "nova",
-              "display_name" => "test 2",
-              "attachments" => [{}],
-              "volume_type" => nil,
-              "snapshot_id" => nil,
-              "size" => 1,
-              "id" => Fog::Mock.random_hex(32),
-              "created_at" => Time.now }
-            ]
-          response.body = { 'volumes' => self.data[:volumes] }
-          response
+          Excon::Response.new(
+            :body   => { 'volumes' => self.data[:volumes].values },
+            :status => 200
+          )
         end
       end
 

data/lib/fog/openstack/requests/compute/revert_resize_server.rb

@@ -3,7 +3,7 @@ module Fog
     class OpenStack
       class Real
 
-        def revert_resized_server(server_id)
+        def revert_resize_server(server_id)
           body = { 'revertResize' => nil }
           server_action(server_id, body)
         end
@@ -12,7 +12,7 @@ module Fog
 
       class Mock
 
-        def revert_resized_server(server_id)
+        def revert_resize_server(server_id)
           response = Excon::Response.new
           response.status = 202
 

data/lib/fog/openstack/requests/compute/update_quota.rb

@@ -6,7 +6,7 @@ module Fog
         def update_quota(tenant_id, options = {})
           options['tenant_id'] = tenant_id
           request(
-            :body => MultiJson.encode({ 'quota_set' => options }),
+            :body => Fog::JSON.encode({ 'quota_set' => options }),
             :expects => 200,
             :method => 'PUT',
             :path => "/os-quota-sets/#{tenant_id}"

data/lib/fog/openstack/requests/identity/create_ec2_credential.rb

@@ -26,7 +26,7 @@ module Fog
           data = { 'tenant_id' => tenant_id }
 
           request(
-            :body    => MultiJson.encode(data),
+            :body    => Fog::JSON.encode(data),
             :expects => [200, 202],
             :method  => 'POST',
             :path    => "users/#{user_id}/credentials/OS-EC2"

data/lib/fog/openstack/requests/identity/create_role.rb

@@ -10,7 +10,7 @@ module Fog
           }
 
           request(
-            :body     => MultiJson.encode(data),
+            :body     => Fog::JSON.encode(data),
             :expects  => [200, 202],
             :method   => 'POST',
             :path   => '/OS-KSADM/roles'

data/lib/fog/openstack/requests/identity/create_user.rb

@@ -15,7 +15,7 @@ module Fog
           }
 
           request(
-            :body     => MultiJson.encode(data),
+            :body     => Fog::JSON.encode(data),
             :expects  => [200, 202],
             :method   => 'POST',
             :path     => '/users'

data/lib/fog/openstack/requests/identity/update_user.rb

@@ -6,7 +6,7 @@ module Fog
         def update_user(user_id, options = {})
           url = options.delete('url') || "/users/#{user_id}"
           request(
-            :body     => MultiJson.encode({ 'user' => options }),
+            :body     => Fog::JSON.encode({ 'user' => options }),
             :expects  => 200,
             :method   => 'PUT',
             :path     => url

data/lib/fog/openstack/requests/image/update_image_members.rb

@@ -11,7 +11,7 @@ module Fog
           data = { 'memberships' => members }
 
           request(
-            :body    => MultiJson.encode(data),
+            :body    => Fog::JSON.encode(data),
             :expects => [200, 202],
             :method  => 'PUT',
             :path    => "images/#{image_id}/members"

data/lib/fog/openstack/requests/volume/create_volume.rb

@@ -17,7 +17,7 @@ module Fog
             data['volume'][key] = options[key]
           end
           request(
-            :body     => MultiJson.encode(data),
+            :body     => Fog::JSON.encode(data),
             :expects  => [200, 202],
             :method   => 'POST',
             :path     => "volumes"