fog 1.4.0 → 1.5.0

data/lib/fog/rackspace/requests/identity/create_token.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Rackspace
+    class Identity
+      class Real
+        def create_token(username, api_key)
+          data = {
+            'auth' => {
+              'RAX-KSKEY:apiKeyCredentials' => {
+                'username' => username,
+                'apiKey' => api_key
+              }
+            }
+          }
+
+          request(
+            :body => Fog::JSON.encode(data),
+            :expects => [200, 203],
+            :method => 'POST',
+            :path => 'tokens'
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+module Fog
+  module Rackspace
+    class Identity
+      class Real
+        def create_user(username, email, enabled, options = {})
+          data = {
+            'user' => {
+              'username' => username,
+              'email' => email,
+              'enabled' => enabled
+            }
+          }
+          data['user']['OS-KSADM:password'] = options[:password] unless options[:password].nil?
+
+          request(
+            :body => Fog::JSON.encode(data),
+            :expects => [201],
+            :method => 'POST',
+            :path => 'users'
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/identity/delete_user.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class Identity
+      class Real
+        def delete_user(user_id)
+          request(
+            :expects => [204],
+            :method => 'DELETE',
+            :path => "users/#{user_id}"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/identity/get_credentials.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class Identity
+      class Real
+        def get_credentials(user_id)
+          request(
+            :expects => [200, 203],
+            :method => 'GET',
+            :path => "users/#{user_id}/OS-KSADM/credentials/RAX-KSKEY:apiKeyCredentials"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/identity/get_user_by_id.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class Identity
+      class Real
+        def get_user_by_id(user_id)
+          request(
+            :expects => [200, 203],
+            :method => 'GET',
+            :path => "users/#{user_id}"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/identity/get_user_by_name.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class Identity
+      class Real
+        def get_user_by_name(username)
+          request(
+            :expects => [200, 203],
+            :method => 'GET',
+            :path => "users?name=#{username}"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/identity/list_credentials.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Rackspace
+    class Identity
+      class Real
+        def list_credentials(user_id)
+          response = request(
+            :expects => [200, 203],
+            :method => 'GET',
+            :path => "users/#{user_id}/OS-KSADM/credentials"
+          )
+
+          unless response.body['credentials'].is_a?(Array)
+            response.body['credentials'] = [response.body['credential']]
+            response.body.delete('credential')
+          end
+
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/identity/list_tenants.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Rackspace
+    class Identity
+      class Real
+        def list_tenants()
+          response = request(
+            :expects => [200, 203],
+            :method => 'GET',
+            :path => 'tenants'
+          )
+
+          unless response.body['tenants'].is_a?(Array)
+            response.body['tenants'] = [response.body['tenant']]
+            response.body.delete('tenant')
+          end
+
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/identity/list_user_roles.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Rackspace
+    class Identity
+      class Real
+        def list_user_roles(user_id)
+          response = request(
+            :expects => [200, 203],
+            :method => 'GET',
+            :path => "users/#{user_id}/roles"
+          )
+
+          unless response.body['roles'].is_a?(Array)
+            response.body['roles'] = [response.body['role']]
+            response.body.delete('role')
+          end
+
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/identity/list_users.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Rackspace
+    class Identity
+      class Real
+        def list_users()
+          response = request(
+            :expects => [200, 203],
+            :method => 'GET',
+            :path => 'users'
+          )
+
+          unless response.body['users'].is_a?(Array)
+            response.body['users'] = [response.body['user']]
+            response.body.delete('user')
+          end
+
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Fog
+  module Rackspace
+    class Identity
+      class Real
+        def update_user(user_id, username, email, enabled, options = {})
+          data = {
+            'user' => {
+              'username' => username,
+              'email' => email,
+              'enabled' => enabled
+            }
+          }
+
+          request(
+            :body => Fog::JSON.encode(data),
+            :expects => [200, 203],
+            :method => 'POST',
+            :path => "users/#{user_id}"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/load_balancers/get_ssl_termination.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class LoadBalancers
+      class Real
+        def get_ssl_termination(load_balancer_id)
+          request(
+            :expects => [200],
+            :path => "loadbalancers/#{load_balancer_id}/ssltermination",
+            :method => 'GET'
+          )
+         end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/load_balancers/remove_ssl_termination.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class LoadBalancers
+      class Real
+        def remove_ssl_termination(load_balancer_id)
+          request(
+            :expects => [200, 202],
+            :path => "loadbalancers/#{load_balancer_id}/ssltermination",
+            :method => 'DELETE'
+          )
+         end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/load_balancers/set_ssl_termination.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Rackspace
+    class LoadBalancers
+      class Real
+        def set_ssl_termination(load_balancer_id, securePort, privatekey, certificate, options = {})
+          data = {
+            securePort: securePort,
+            privatekey: privatekey,
+            certificate: certificate
+          }
+
+          if options.has_key? :intermediate_certificate
+            data['intermediateCertificate'] = options[:intermediate_certificate]
+          end
+          if options.has_key? :enabled
+            data['enabled'] = options[:enabled]
+          end
+          if options.has_key? :secure_traffic_only
+            data['secureTrafficOnly'] = options[:secure_traffic_only]
+          end
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects => [200, 202],
+            :path => "loadbalancers/#{load_balancer_id}/ssltermination",
+            :method => 'PUT'
+          )
+         end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/storage.rb

@@ -100,7 +100,7 @@ module Fog
 
         def request(params, parse_json = true, &block)
           begin
-            response = @connection.request(params.merge!({
+            response = @connection.request(params.merge({
               :headers  => {
                 'Content-Type' => 'application/json',
                 'X-Auth-Token' => @auth_token

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

@@ -71,6 +71,7 @@ module Fog
 
         def destroy(options = {})
           requires :instance_uuid
+          stop if ready? # need to turn it off before destroying
           connection.vm_destroy('instance_uuid' => instance_uuid)
         end
 

data/lib/fog/vsphere/requests/compute/vm_clone.rb

@@ -22,7 +22,7 @@ module Fog
           end
           dc_name = path_elements.shift
           if not self.datacenters.include? dc_name then
-            raise ArgumentError, "Datacenter #{dc_name} does not exist, only datacenters #{self.dacenters.join(",")} are accessible."
+            raise ArgumentError, "Datacenter #{dc_name} does not exist, only datacenters #{self.datacenters.join(",")} are accessible."
           end
           options
         end
@@ -166,7 +166,7 @@ module Fog
         def vm_clone(options = {})
           # Option handling
           options = vm_clone_check_options(options)
-          notfound = lambda { raise Fog::Compute::Vsphere::NotFound, "Cloud not find VM template" }
+          notfound = lambda { raise Fog::Compute::Vsphere::NotFound, "Could not find VM template" }
           vm_mob_ref = list_virtual_machines['virtual_machines'].find(notfound) do |vm|
             vm['name'] == options['path'].split("/")[-1]
           end

data/tests/aws/models/compute/address_tests.rb

@@ -15,9 +15,10 @@ Shindo.tests("Fog::Compute[:aws] | address", ['aws']) do
         @instance.server.public_ip_address == @instance.public_ip
       end
     end
-    
+
     @server.destroy
 
   end
 
+  model_tests(Fog::Compute[:aws].addresses, { :domain => "vpc" }, true)
 end

data/tests/aws/models/compute/volume_tests.rb

@@ -18,7 +18,7 @@ Shindo.tests("Fog::Compute[:aws] | volume", ['aws']) do
     end
 
     tests('#server = nil').succeeds do
-      @instance.server = nil
+      (@instance.server = nil).nil?
     end
 
     @instance.wait_for { ready? }

data/tests/aws/models/dns/records_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests("Fog::DNS[:aws] | records", ['aws', 'dns']) do
-
   pending if Fog.mocking?
+
   tests("zones#create").succeeds do
     @zone = Fog::DNS[:aws].zones.create(:domain => generate_unique_domain)
   end
@@ -16,6 +16,24 @@ Shindo.tests("Fog::DNS[:aws] | records", ['aws', 'dns']) do
     collection_tests(@zone.records, params, false)
   end
 
+  records = []
+
+  100.times do |i|
+    records << @zone.records.create(:name => "#{i}.#{@zone.domain}", :type => "A", :ttl => 3600, :value => ['1.2.3.4'])
+  end
+
+  tests("#all!").returns(102) do
+    @zone.records.all!.size
+  end
+
+  tests("#all!").returns(102) do
+    @zone.records.all!.size
+  end
+
+  records.each do |record|
+    record.destroy
+  end
+
   tests("zones#destroy").succeeds do
     @zone.destroy
   end

data/tests/aws/models/storage/directory_tests.rb

@@ -17,7 +17,7 @@ Shindo.tests("Storage[:aws] | directory", [:aws]) do
       end
 
       tests("#versioning=(false)").succeeds do
-        @instance.versioning = false
+        (@instance.versioning = false).equal? false
       end
 
       tests("#versioning=(false) sets versioning to 'Suspended'").returns('Suspended') do

data/tests/aws/models/storage/url_tests.rb

@@ -13,8 +13,14 @@ Shindo.tests('AWS | url') do
   
   @file = @storage.directories.new(key: 'fognonbucket').files.new(key: 'test.txt')
 
+  if Fog.mock?
+    signature = Fog::Storage::AWS.new.signature(nil)
+  else
+    signature = 'tajHIhKHAdFYsigmzybCpaq8N0Q%3D'
+  end
+
   tests('#url w/ response-cache-control').returns(
-    'https://fognonbucket.s3.amazonaws.com/test.txt?response-cache-control=No-cache&AWSAccessKeyId=123&Signature=tajHIhKHAdFYsigmzybCpaq8N0Q%3D&Expires=1356998400'
+    "https://fognonbucket.s3.amazonaws.com/test.txt?response-cache-control=No-cache&AWSAccessKeyId=123&Signature=#{signature}&Expires=1356998400"
   ) do
     @file.url(@expires, query: { 'response-cache-control' => 'No-cache' })
   end

data/tests/aws/requests/auto_scaling/auto_scaling_tests.rb

@@ -3,8 +3,6 @@ Shindo.tests('AWS::AutoScaling | auto_scaling_tests', ['aws', 'auto_scaling']) d
   @lc_name = 'fog-test-lc'
 
   tests('success') do
-    pending if Fog.mocking?
-
     tests("#describe_adjustment_types").formats(AWS::AutoScaling::Formats::DESCRIBE_ADJUSTMENT_TYPES) do
       Fog::AWS[:auto_scaling].describe_adjustment_types.body
     end
@@ -54,15 +52,19 @@ Shindo.tests('AWS::AutoScaling | auto_scaling_tests', ['aws', 'auto_scaling']) d
     end
 
     tests("#describe_scaling_activities").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do
+      pending if Fog.mocking?
       Fog::AWS[:auto_scaling].describe_scaling_activities().body
     end
     tests("#describe_scaling_activities").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do
+      pending if Fog.mocking?
       Fog::AWS[:auto_scaling].describe_scaling_activities('ActivityIds' => '1').body
     end
     tests("#describe_scaling_activities").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do
+      pending if Fog.mocking?
       Fog::AWS[:auto_scaling].describe_scaling_activities('ActivityIds' => ['1', '2']).body
     end
     tests("#describe_scaling_activities").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do
+      pending if Fog.mocking?
       Fog::AWS[:auto_scaling].describe_scaling_activities('AutoScalingGroupName' => @asg_name).body
     end