fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

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

@@ -6,6 +6,7 @@ module Fog
           response = @identity_connection.request({
             :expects => [200, 204],
             :headers => {'Content-Type' => 'application/json',
+                         'Accept' => 'application/json',
                          'X-Auth-Token' => @auth_token},
             :method  => 'GET',
             :path    => '/v2.0/tenants'

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

@@ -15,8 +15,20 @@ module Fog
 
       class Mock
 
+        def release_address(address_id)
+          response = Excon::Response.new
+          response.status = 202
+          response.headers = {
+            "Content-Type" => "text/html; charset=UTF-8",
+            "Content-Length" => "0",
+            "Date" => Date.new
+          }
+          response.body = {}
+          response
+        end
+
+      end # mock
 
-      end
     end
   end
 end

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

@@ -0,0 +1,24 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+
+        def reset_server_state(server_id, status)
+          body = { 'os-resetState' => { 'state' => status } }
+          server_action(server_id, body, 202)
+        end
+
+      end
+
+      class Mock
+
+        def reset_server_state(server_id, status)
+          response = get_server_details(server_id)
+          response.body['server']['status'] = status.upcase
+          response
+        end
+
+      end
+    end
+  end
+end

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

@@ -13,12 +13,17 @@ module Fog
 
       class Mock
         def add_user_to_tenant(tenant_id, user_id, role_id)
+          role = self.data[:roles][role_id]
+          self.data[:user_tenant_membership][tenant_id] ||= {}
+          self.data[:user_tenant_membership][tenant_id][user_id] ||= []
+          self.data[:user_tenant_membership][tenant_id][user_id].push(role['id']).uniq!
+
           response = Excon::Response.new
           response.status = 200
           response.body = {
             'role' => {
-              'id' => '503df61a99d6461fb247cdb6a3f3a4dd',
-              'name' => 'admin'
+              'id'   => role['id'],
+              'name' => role['name']
             }
           }
           response

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

@@ -0,0 +1,58 @@
+module Fog
+  module Identity
+    class OpenStack
+      class Real
+
+        ##
+        # Create an EC2 credential for a user in a tenant.  Requires
+        # administrator credentials.
+        #
+        # ==== Parameters
+        # * user_id<~String>: The id of the user to create an EC2 credential
+        #   for
+        # * tenant_id<~String>: The id of the tenant to create the credential
+        #   in
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'credential'<~Hash>: Created EC2 credential
+        #       * 'access'<~String>: The access key
+        #       * 'secret'<~String>: The secret key
+        #       * 'user_id'<~String>: The user id
+        #       * 'tenant_id'<~String>: The tenant id
+
+        def create_ec2_credential(user_id, tenant_id)
+          data = { 'tenant_id' => tenant_id }
+
+          request(
+            :body    => MultiJson.encode(data),
+            :expects => [200, 202],
+            :method  => 'POST',
+            :path    => "users/#{user_id}/credentials/OS-EC2"
+          )
+        end
+      end
+
+      class Mock
+        def create_ec2_credential(user_id, tenant_id)
+          response = Excon::Response.new
+          response.status = 200
+
+          data = {
+            'access'    => Fog::Mock.random_hex(32),
+            'secret'    => Fog::Mock.random_hex(32),
+            'tenant_id' => tenant_id,
+            'user_id'   => user_id,
+          }
+
+          self.data[:ec2_credentials][user_id][data['access']] = data
+
+          response.body = { 'credential' => data }
+
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -21,7 +21,7 @@ module Fog
       class Mock
         def create_role(name)
           data = {
-            'id'   => Fog::Mock.random_numbers(6).to_s,
+            'id'   => Fog::Mock.random_hex(32),
             'name' => name
           }
           self.data[:roles][data['id']] = data

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

@@ -7,9 +7,7 @@ module Fog
             :expects => [200],
             :method  => 'POST',
             :path    => "tenants",
-            :body    => {
-              'tenant' => attributes
-            }.to_json
+            :body    => Fog::JSON.encode({ 'tenant' => attributes })
           )
         end # def create_tenant
       end # class Real

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

@@ -0,0 +1,44 @@
+module Fog
+  module Identity
+    class OpenStack
+      class Real
+
+        ##
+        # Destroy an EC2 credential for a user.  Requires administrator
+        # credentials.
+        #
+        # ==== Parameters
+        # * user_id<~String>: The id of the user to delete the credential
+        #   for
+        # * access<~String>: The access key of the credential to destroy
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~String>:  Empty string
+
+        def delete_ec2_credential(user_id, access)
+          request(
+            :expects => [200, 204],
+            :method  => 'DELETE',
+            :path    => "users/#{user_id}/credentials/OS-EC2/#{access}"
+          )
+        end
+      end
+
+      class Mock
+        def delete_ec2_credential(user_id, access)
+          raise Fog::Identity::OpenStack::NotFound unless
+            self.data[:ec2_credentials][user_id][access]
+
+          self.data[:ec2_credentials][user_id].delete access
+
+          response = Excon::Response.new
+          response.status = 204
+          response
+        rescue
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,49 @@
+module Fog
+  module Identity
+    class OpenStack
+      class Real
+
+        ##
+        # Retrieves an EC2 credential for a user.  Requires administrator
+        # credentials.
+        #
+        # ==== Parameters
+        # * user_id<~String>: The id of the user to retrieve the credential
+        #   for
+        # * access<~String>: The access key of the credential to retrieve
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'credential'<~Hash>: The EC2 credential
+        #       * 'access'<~String>: The access key
+        #       * 'secret'<~String>: The secret key
+        #       * 'user_id'<~String>: The user id
+        #       * 'tenant_id'<~String>: The tenant id
+
+        def get_ec2_credential(user_id, access)
+          request(
+            :expects => [200, 202],
+            :method  => 'GET',
+            :path    => "users/#{user_id}/credentials/OS-EC2/#{access}"
+          )
+        rescue Excon::Errors::Unauthorized
+          raise Fog::Identity::OpenStack::NotFound
+        end
+      end
+
+      class Mock
+        def get_ec2_credential(user_id, access)
+          ec2_credential = self.data[:ec2_credentials][user_id][access]
+
+          raise Fog::OpenStack::Identity::NotFound unless ec2_credential
+
+          response = Excon::Response.new
+          response.status = 200
+          response.body = { 'credential' => ec2_credential }
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -15,7 +15,15 @@ module Fog
 
       class Mock
 
+        def get_user_by_name(name)
+          response = Excon::Response.new
+          response.status = 200
 
+          response.body = {
+            'users' => self.data[:users].values
+          }
+          response
+        end
 
       end
     end

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

@@ -0,0 +1,44 @@
+module Fog
+  module Identity
+    class OpenStack
+      class Real
+
+        ##
+        # List EC2 credentials for a user.  Requires administrator
+        # credentials.
+        #
+        # ==== Parameters
+        # * user_id<~String>: The id of the user to retrieve the credential
+        #   for
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'credentials'<~Array>: The user's EC2 credentials
+        #       * 'access'<~String>: The access key
+        #       * 'secret'<~String>: The secret key
+        #       * 'user_id'<~String>: The user id
+        #       * 'tenant_id'<~String>: The tenant id
+
+        def list_ec2_credentials(user_id)
+          request(
+            :expects => [200, 202],
+            :method  => 'GET',
+            :path    => "users/#{user_id}/credentials/OS-EC2"
+          )
+        end
+      end
+
+      class Mock
+        def list_ec2_credentials(user_id)
+          ec2_credentials = self.data[:ec2_credentials][user_id].values
+
+          response = Excon::Response.new
+          response.status = 200
+          response.body = { 'credentials' => ec2_credentials }
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -13,8 +13,14 @@ module Fog
 
       class Mock
         def list_roles_for_user_on_tenant(tenant_id, user_id)
+          self.data[:user_tenant_membership][tenant_id] ||= {}
+          self.data[:user_tenant_membership][tenant_id][user_id] ||= []
+          roles = self.data[:user_tenant_membership][tenant_id][user_id].map do |role_id|
+            self.data[:roles][role_id]
+          end
+
           Excon::Response.new(
-            :body   => { 'roles' => self.data[:roles].values },
+            :body   => { 'roles' => roles },
             :status => 200
           )
         end # def list_roles_for_user_on_tenant

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

@@ -14,8 +14,17 @@ module Fog
 
       class Mock
         def list_users(tenant_id = nil)
+          users = self.data[:users].values
+
+          if tenant_id
+            users = users.select {
+              |user| user['tenantId'] == tenant_id
+            }
+          end
+                         
+          
           Excon::Response.new(
-            :body   => { 'users' => self.data[:users].values },
+            :body   => { 'users' => users },
             :status => 200
           )
         end

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

@@ -0,0 +1,21 @@
+module Fog
+  module Identity
+    class OpenStack
+
+      class Real
+        def set_tenant(tenant)
+          @openstack_must_reauthenticate = true
+          @openstack_tenant = tenant.to_s
+          authenticate
+        end
+      end
+
+      class Mock
+        def set_tenant(tenant)
+          true
+        end
+      end
+
+    end # class OpenStack
+  end # module Identity
+end # module Fog

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

@@ -7,9 +7,7 @@ module Fog
             :expects => [200],
             :method  => 'PUT',
             :path    => "tenants/#{id}",
-            :body    => {
-              'tenant' => attributes
-            }.to_json
+            :body    => Fog::JSON.encode({ 'tenant' => attributes })
           )
         end # def create_tenant
       end # class Real

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

@@ -16,11 +16,13 @@ module Fog
             'x-image-meta-checksum' => attributes[:checksum],
             'x-image-meta-owner' => attributes[:owner],
             'x-glance-api-copy-from' => attributes[:copy_from]
-          }
+          }.reject { |k,v| v.nil? }
 
           body = String.new
           if attributes[:location]
             body = File.open(attributes[:location], "rb")
+            # Make sure the image file size is always present
+            data['x-image-meta-size'] = File.size(body)
           end
 
           unless attributes[:properties].nil?

data/lib/fog/openstack/volume.rb

@@ -6,7 +6,7 @@ module Fog
 
       requires :openstack_auth_url
       recognizes :openstack_auth_token, :openstack_management_url, :persistent,
-                 :openstack_service_name, :openstack_tenant,
+                 :openstack_service_type, :openstack_service_name, :openstack_tenant,
                  :openstack_api_key, :openstack_username,
                  :current_user, :current_tenant
 
@@ -111,7 +111,8 @@ module Fog
           @openstack_auth_uri             = URI.parse(options[:openstack_auth_url])
           @openstack_management_url       = options[:openstack_management_url]
           @openstack_must_reauthenticate  = false
-          @openstack_service_name         = options[:openstack_service_name] || ['volume']
+          @openstack_service_type         = options[:openstack_service_type] || ['volume']
+          @openstack_service_name         = options[:openstack_service_name]
 
           @connection_options = options[:connection_options] || {}
 
@@ -142,6 +143,7 @@ module Fog
             response = @connection.request(params.merge({
               :headers  => {
                 'Content-Type' => 'application/json',
+                'Accept' => 'application/json',
                 'X-Auth-Token' => @auth_token
               }.merge!(params[:headers] || {}),
               :host     => @host,
@@ -174,13 +176,14 @@ module Fog
         private
 
         def authenticate
-          if @openstack_must_reauthenticate || @openstack_auth_token.nil?
+          if !@openstack_management_url || @openstack_must_reauthenticate
             options = {
               :openstack_tenant   => @openstack_tenant,
               :openstack_api_key  => @openstack_api_key,
               :openstack_username => @openstack_username,
               :openstack_auth_uri => @openstack_auth_uri,
               :openstack_auth_token => @openstack_auth_token,
+              :openstack_service_type => @openstack_service_type,
               :openstack_service_name => @openstack_service_name,
               :openstack_endpoint_type => 'adminURL'
             }