fog 1.8.0 → 1.9.0

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

@@ -15,6 +15,8 @@ module Fog
 
       class Mock
         def delete_security_group(security_group_id)
+          self.data[:security_groups].delete security_group_id
+
           response = Excon::Response.new
           response.status = 202
           response.headers = {

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

@@ -18,48 +18,24 @@ module Fog
       end
 
       class Mock
-        def list_security_groups
-          self.data[:security_groups] ||= [
-            { "rules" => [
-              { "from_port" => 44,
-                "group" => {},
-                "ip_protocol" => "tcp",
-                "to_port" => 55,
-                "parent_group_id" => 1,
-                "ip_range" => {"cidr"=>"10.10.10.10/24"},
-                "id" => Fog::Mock.random_numbers(2).to_i
-              },
-              { "from_port" => 2,
-                "group" => {},
-                "ip_protocol" => "tcp",
-                "to_port" => 3,
-                "parent_group_id" => 1,
-                "ip_range" => {"cidr"=>"10.10.10.10/24"},
-                "id" => Fog::Mock.random_numbers(2).to_i
-              } ],
-              "tenant_id" => @openstack_tenant,
-              "id" => Fog::Mock.random_numbers(2).to_i,
-              "name" => "default",
-              "description" => "default"
-            },
-            {
-              "rules" => [
-              { "from_port" => 44,
-                "group" => {},
-                "ip_protocol" => "tcp",
-                "to_port" => 55,
-                "parent_group_id" => 2,
-                "ip_range" => { "cidr"=>"10.10.10.10/24" },
-                "id"=> Fog::Mock.random_numbers(2).to_i
-              } ],
-            "tenant_id" => @openstack_tenant,
-            "id" => Fog::Mock.random_numbers(2).to_i,
-            "name" => "test",
-            "description" => "this is a test"
-            }
-          ]
+        def list_security_groups(server_id = nil)
+          security_groups = self.data[:security_groups].values
+
+          groups = if server_id then
+                     server_group_names =
+                       self.data[:server_security_group_map][server_id]
+
+                     server_group_names.map do |name|
+                       security_groups.find do |sg|
+                         sg['name'] == name
+                       end
+                     end.compact
+                   else
+                     security_groups
+                   end
+
           Excon::Response.new(
-            :body     => { 'security_groups' => self.data[:security_groups].values },
+            :body     => { 'security_groups' => groups },
             :headers  => {
               "X-Compute-Request-Id" => "req-#{Fog::Mock.random_base64(36)}",
               "Content-Type" => "application/json",

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_base64(64),
+            '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/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/requests/network/associate_floating_ip.rb

@@ -0,0 +1,49 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def associate_floating_ip(floating_ip_id, port_id, options = {})
+          data = {
+            'floating_ip' => {
+              'port_id'    => port_id,
+            }
+          }
+
+          vanilla_options = [:fixed_ip_address]
+          vanilla_options.reject{ |o| options[o].nil? }.each do |key|
+            data['floating_ip'][key] = options[key]
+          end
+
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => [200],
+            :method   => 'PUT',
+            :path     => "floatingips/#{floating_ip_id}"
+          )
+        end
+      end
+
+      class Mock
+        def associate_floating_ip(floating_ip_id, port_id, options = {})
+          response = Excon::Response.new
+          response.status = 201
+          data = {
+            'id'                  => '00000000-0000-0000-0000-000000000000',
+            'router_id'           => '00000000-0000-0000-0000-000000000000',
+            'tenant_id'           => options["tenant_id"],
+            'floating_network_id' => options["floating_network_id"],
+            'fixed_ip_address'    => options["fixed_ip_address"],
+            'floating_ip_address' => options["floating_ip_address"],
+            'port_id'             => port_id,
+          }
+
+          self.data[:floating_ips][data['floating_ip_id']] = data
+          response.body = { 'floating_ip' => data }
+          response
+        end
+      end
+
+    end
+  end
+end