fog 1.6.0 → 1.7.0

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

@@ -30,24 +30,26 @@ module Fog
           response = Excon::Response.new
           response.status = 200
           response.headers = {
-            "X-Compute-Request-Id" => "req-63a90344-7c4d-42e2-936c-fd748bced1b3",
-            "Content-Type" => "application/json",
-            "Content-Length" => "163",
-            "Date" => Date.new
+            'X-Compute-Request-Id' => "req-#{Fog::Mock.random_hex(32)}",
+            'Content-Type'   => 'application/json',
+            'Content-Length' => Fog::Mock.random_numbers(3).to_s,
+            'Date' => Date.new
           }
-          response.body = {
-            "security_group_rule" => {
-              "from_port" => from_port,
-              "group"     => group_id || {},
-              "ip_protocol" => ip_protocol,
-              "to_port" => to_port,
-              "parent_group_id" => parent_group_id,
-              "ip_range" => {
-                "cidr" => cidr
-              },
-              "id"=>1
+          rule = {
+            'id' => Fog::Mock.random_numbers(2).to_i,
+            'from_port'   => from_port,
+            'group'       => group_id || {},
+            'ip_protocol' => ip_protocol,
+            'to_port'     => to_port,
+            'parent_group_id' => parent_group_id,
+            'ip_range' => {
+              'cidr'   => cidr
             }
           }
+          self.data[:security_groups][parent_group_id]['rules'].push(rule)
+          response.body = {
+            'security_group_rule' => rule
+          }
           response
         end
       end # mock

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

@@ -35,6 +35,10 @@ module Fog
             end
           end
 
+          if options['os:scheduler_hints']
+            data['os:scheduler_hints'] = options['os:scheduler_hints']
+          end
+
           request(
             :body     => Fog::JSON.encode(data),
             :expects  => [200, 202],
@@ -63,7 +67,9 @@ module Fog
             'accessIPv4' => options['accessIPv4'] || "",
             'accessIPv6' => options['accessIPv6'] || "",
             'progress'   => 0,
-            'status'     => 'BUILD'
+            'status'     => 'BUILD',
+            'created'    => '2012-09-27T00:04:18Z',
+            'updated'    => '2012-09-27T00:04:27Z',
           }
 
           self.data[:last_modified][:servers][data['id']] = Time.now

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

@@ -33,16 +33,16 @@ module Fog
           response.status = 202
           response.body = {
             'volume' => {
-              'id'                 => Fog::Mock.random_numbers(2),
-              'displayName'        => name,
-              'displayDescription' => description,
-              'size'               => size,
-              'status'             => 'creating',
-              'snapshotId'         => '4',
-              'volumeType'         => nil,
-              'availabilityZone'   => 'nova',
-              'createdAt'          => Time.now,
-              'attachments'         => []
+              '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'          => []
             }
           }
           response

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

@@ -24,7 +24,22 @@ module Fog
       end
 
       class Mock
-
+        def create_volume_snapshot(volume_id, name, description, force=false)
+          response = Excon::Response.new
+          response.status = 202
+          response.body = {
+            "snapshot"=> {
+               "status"=>"creating",
+               "display_name"=>name,
+               "created_at"=>Time.now,
+               "display_description"=>description,
+               "volume_id"=>volume_id,
+               "id"=>"5",
+               "size"=>1
+            }
+          }
+          response
+        end
       end
 
     end

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

@@ -14,6 +14,11 @@ module Fog
       end
 
       class Mock
+        def detach_volume(server_id, attachment_id)
+          response = Excon::Response.new
+          response.status = 202
+          response
+        end
       end
 
     end

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

@@ -22,12 +22,12 @@ module Fog
           response.body = {
             'snapshot' => {
               'id'                 => '1',
-              'displayName'        => Fog::Mock.random_letters(rand(8) + 5),
-              'displayDescription' => Fog::Mock.random_letters(rand(12) + 10),
+              'display_name'        => Fog::Mock.random_letters(rand(8) + 5),
+              'display_description' => Fog::Mock.random_letters(rand(12) + 10),
               'size'               => 3,
-              'volumeId'           => '4',
+              'volume_id'           => '4',
               'status'             => 'online',
-              'createdAt'          => Time.now
+              'created_at'          => Time.now
             }
           }
           response

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

@@ -21,15 +21,15 @@ module Fog
           response.status = 200
           response.body = {
             'volume' => {
-              'id'                 => '1',
-              'displayName'        => Fog::Mock.random_letters(rand(8) + 5),
-              'displayDescription' => Fog::Mock.random_letters(rand(12) + 10),
-              'size'               => 3,
-              'volumeType'         => nil,
-              'snapshotId'         => '4',
-              'status'             => 'online',
-              'availabilityZone'   => 'nova',
-              'createdAt'          => Time.now,
+              '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'         => []
             }
           }

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

@@ -19,7 +19,7 @@ module Fog
 
       class Mock
         def list_security_groups
-          self.data[:security_groups] = [
+          self.data[:security_groups] ||= [
             { "rules" => [
               { "from_port" => 44,
                 "group" => {},
@@ -57,9 +57,9 @@ module Fog
             "name" => "test",
             "description" => "this is a test"
             }
-          ] unless self.data.empty?
+          ]
           Excon::Response.new(
-            :body     => { 'security_groups' => self.data[:security_groups] },
+            :body     => { 'security_groups' => self.data[:security_groups].values },
             :headers  => {
               "X-Compute-Request-Id" => "req-#{Fog::Mock.random_base64(36)}",
               "Content-Type" => "application/json",

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

@@ -21,25 +21,25 @@ module Fog
           response.status = 200
           self.data[:volumes] ||= [
             { "status" => "available",
-              "displayDescription" => "",
-              "availabilityZone" => "nova",
-              "displayName" => "test 1",
+              "display_description" => "",
+              "availability_zone" => "nova",
+              "display_name" => "test 1",
               "attachments" => [{}],
-              "volumeType" => nil,
-              "snapshotId" => Fog::Mock.random_numbers(2),
+              "volume_type" => nil,
+              "snapshot_id" => nil,
               "size" => 1,
-              "id" => "6",
-              "createdAt" => Time.now },
+              "id" => Fog::Mock.random_hex(32),
+              "created_at" => Time.now },
             { "status" => "available",
-              "displayDescription" => "",
-              "availabilityZone" => "nova",
-              "displayName" => "test 2",
+              "display_description" => "",
+              "availability_zone" => "nova",
+              "display_name" => "test 2",
               "attachments" => [{}],
-              "volumeType" => nil,
-              "snapshotId" => Fog::Mock.random_numbers(2),
+              "volume_type" => nil,
+              "snapshot_id" => nil,
               "size" => 1,
-              "id" => "8",
-              "createdAt" => Time.now}
+              "id" => Fog::Mock.random_hex(32),
+              "created_at" => Time.now }
             ]
           response.body = { 'volumes' => self.data[:volumes] }
           response

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

@@ -20,10 +20,10 @@ module Fog
           response.status = [200, 204][rand(1)]
           response.body = {
             'tenant' => {
-              'id' => '1',
-              'description' => 'Has access to everything',
+              'id' => "df9a815161eba9b76cc748fd5c5af73e",
+              'description' => attributes['description'] || 'normal tenant',
               'enabled' => true,
-              'name' => 'admin'
+              'name' => attributes['name'] || 'default'
             }
           }
           response

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

@@ -30,7 +30,7 @@ module Fog
           response = Excon::Response.new
           response.status = 200
           data = {
-            'id'       => Fog::Mock.random_numbers(6).to_s,
+            'id'       => Fog::Mock.random_hex(32),
             'name'     => name,
             'email'    => email,
             'tenantId' => tenantId,

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

@@ -17,7 +17,7 @@ module Fog
 
         def delete_role(role_id)
           response = Excon::Response.new
-          if list_roles.body['roles'].map { |r| r['id'] }.include? role_id
+          if self.data[:roles][role_id]
             self.data[:roles].delete(role_id)
             response.status = 204
             response

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

@@ -17,7 +17,7 @@ module Fog
           response.status = [200, 204][rand(1)]
           response.body = {
             'tenant' => {
-              'id' => '1',
+              'id' => id,
               'description' => 'Has access to everything',
               'enabled' => true,
               'name' => 'admin'

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

@@ -16,6 +16,13 @@ module Fog
       class Mock
 
         def list_roles
+          if self.data[:roles].empty?
+            ['admin', 'Member'].each do |name|
+              id = Fog::Mock.random_hex(32)
+              self.data[:roles][id] = {'id' => id, 'name' => name}
+            end
+          end
+
           Excon::Response.new(
             :body   => { 'roles' => self.data[:roles].values },
             :status => 200

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

@@ -4,35 +4,33 @@ module Fog
       class Real
 
         def create_image(attributes)
-
-
           data = {
-              "Content-Type"=>"application/octet-stream",
-              "x-image-meta-name" => attributes[:name],
-              "x-image-meta-disk-format" => attributes[:disk_format],
-              "x-image-meta-container-format" => attributes[:container_format],
-              "x-image-meta-size" => attributes[:size],
-              "x-image-meta-is-public" => attributes[:is_public],
-              "x-image-meta-owner" => attributes[:owner],
-              "x-glance-api-copy-from" => attributes[:copy_from]
+            'Content-Type'=>'application/octet-stream',
+            'x-image-meta-name' => attributes[:name],
+            'x-image-meta-disk-format' => attributes[:disk_format],
+            'x-image-meta-container-format' => attributes[:container_format],
+            'x-image-meta-size' => attributes[:size],
+            'x-image-meta-is-public' => attributes[:is_public],
+            'x-image-meta-min-ram'  => attributes[:min_ram],
+            'x-image-meta-min-disk' => attributes[:min_disk],
+            'x-image-meta-checksum' => attributes[:checksum],
+            'x-image-meta-owner' => attributes[:owner],
+            'x-glance-api-copy-from' => attributes[:copy_from]
           }
 
           body = String.new
           if attributes[:location]
-            file = File.open(attributes[:location], "rb")
-            body = file
+            body = File.open(attributes[:location], "rb")
           end
 
           unless attributes[:properties].nil?
             attributes[:properties].each do |key,value|
-              data["x-image-meta-property-#{key}"] = value
+              data['x-image-meta-property-#{key}'] = value
             end
           end
 
-
-
           request(
-            :headers     => data,
+            :headers  => data,
             :body     => body,
             :expects  => 201,
             :method   => 'POST',
@@ -49,30 +47,30 @@ module Fog
         def create_image(attributes)
           response = Excon::Response.new
           response.status = 201
-          response.body = {"image"=>
-                               {"name"=>"new image",
-                                "size"=>0,
-                                "min_disk"=>0,
-                                "disk_format"=>nil,
-                                "created_at"=>"2012-02-24T06:45:00",
-                                "container_format"=>nil,
-                                "deleted_at"=>nil,
-                                "updated_at"=>"2012-02-24T06:45:00",
-                                "checksum"=>nil,
-                                "id"=>"e41304f3-2453-42b4-9829-2e220a737395",
-                                "deleted"=>false,
-                                "protected"=>false,
-                                "is_public"=>false,
-                                "status"=>"queued",
-                                "min_ram"=>0,
-                                "owner"=>"728ecc7c10614a1faa6fbabd1a68a4a0",
-                                "properties"=>{}
-                               }
-                           }
-          response
 
+          image_id = Fog::Mock.random_hex(32)
+          image = self.data[:images][image_id] = {
+            'name'             => attributes['name'] || attributes[:name],
+            'size'             => Fog::Mock.random_numbers(8).to_i,
+            'min_disk'         => 0,
+            'disk_format'      => attributes['disk_format'] || attributes[:disk_format] || 'raw',
+            'created_at'       => Time.now.to_s,
+            'container_format' => attributes['container_format'] || attributes[:container_format] || 'bare',
+            'deleted_at'       => nil,
+            'updated_at'       => Time.now.to_s,
+            'checksum'         => Fog::Mock.random_hex(32),
+            'id'               => image_id,
+            'deleted'          => false,
+            'protected'        => false,
+            'is_public'        => false,
+            'status'           => 'queued',
+            'min_ram'          => 0,
+            'owner'            => attributes['owner'] || attributes[:owner],
+            'properties'       => attributes['properties'] || attributes[:properties] || {}
+          }
+          response.body = { 'image'=> image }
+          response
         end
-
       end
     end
   end

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

@@ -14,13 +14,11 @@ module Fog
       end
 
       class Mock
-
         def delete_image(image_id)
           response = Excon::Response.new
           response.status = 200
           response
         end
-
       end
     end
   end

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

@@ -16,31 +16,13 @@ module Fog
           response = Excon::Response.new
           response.status = [200, 204][rand(1)]
           response.body = {
-              "images"=>[{
-                "name"=>"mock-image-name",
-                "size"=>25165824,
-                "disk_format"=>"ami",
-                "container_format"=>"ami",
-                "id"=>"0e09fbd6-43c5-448a-83e9-0d3d05f9747e",
-                "checksum"=>"2f81976cae15c16ef0010c51e3a6c163"},
-               {"name"=>"new image",
-                "size"=>0,
-                "min_disk"=>0,
-                "disk_format"=>nil,
-                "created_at"=>"2012-02-24T06:45:00",
-                "container_format"=>nil,
-                "deleted_at"=>nil,
-                "updated_at"=>"2012-02-24T06:45:00",
-                "checksum"=>nil,
-                "id"=>"e41304f3-2453-42b4-9829-2e220a737395",
-                "deleted"=>false,
-                "protected"=>false,
-                "is_public"=>false,
-                "status"=>"queued",
-                "min_ram"=>0,
-                "owner"=>"728ecc7c10614a1faa6fbabd1a68a4a0",
-                "properties"=>{}
-                }]
+            "images"=>[{
+              "name"             => Fog::Mock.random_letters(10),
+              "size"             => Fog::Mock.random_numbers(8).to_i,
+              "disk_format"      => "iso",
+              "container_format" => "bare",
+              "id"               => Fog::Mock.random_hex(36),
+              "checksum"         => Fog::Mock.random_hex(32)}]
           }
           response
         end # def list_tenants