From 4810343c13dfe05b144589e21d67a35995d64e04 Mon Sep 17 00:00:00 2001
From: Thom Mahoney <tmahoney@engineyard.com>
Date: Fri, 17 Aug 2012 15:56:26 -0700
Subject: [PATCH] Better mocks for invalid Provisioned IOPS values

---
 lib/fog/aws/requests/compute/create_volume.rb | 13 +++++++++++--
 tests/aws/requests/compute/volume_tests.rb    | 10 ++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/lib/fog/aws/requests/compute/create_volume.rb b/lib/fog/aws/requests/compute/create_volume.rb
index 803956926..0bcd61981 100644
--- a/lib/fog/aws/requests/compute/create_volume.rb
+++ b/lib/fog/aws/requests/compute/create_volume.rb
@@ -66,7 +66,8 @@ module Fog
             end
 
             if options['VolumeType'] == 'io1'
-              if !options['Iops']
+              iops = options['Iops']
+              if !iops
                 raise Fog::Compute::AWS::Error.new("InvalidParameterCombination => The parameter iops must be specified for io1 volumes.")
               end
 
@@ -74,9 +75,17 @@ module Fog
                 raise Fog::Compute::AWS::Error.new("InvalidParameterValue => Volume of #{size}GiB is too small; minimum is 10GiB.")
               end
 
-              if (iops_to_size_ratio = options['Iops'].to_f / size.to_f) > 10.0
+              if (iops_to_size_ratio = iops.to_f / size.to_f) > 10.0
                 raise Fog::Compute::AWS::Error.new("InvalidParameterValue => Iops to volume size ratio of #{"%.1f" % iops_to_size_ratio} is too high; maximum is 10.0")
               end
+
+              if iops < 100
+                raise Fog::Compute::AWS::Error.new("VolumeIOPSLimit => Volume iops of #{iops} is too low; minimum is 100.")
+              end
+
+              if iops > 1000
+                raise Fog::Compute::AWS::Error.new("VolumeIOPSLimit => Volume iops of #{iops} is too high; maximum is 1000.")
+              end
             end
 
             response.status = 200
diff --git a/tests/aws/requests/compute/volume_tests.rb b/tests/aws/requests/compute/volume_tests.rb
index 4bf34e312..a7d3c787d 100644
--- a/tests/aws/requests/compute/volume_tests.rb
+++ b/tests/aws/requests/compute/volume_tests.rb
@@ -179,6 +179,16 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
       Fog::Compute[:aws].create_volume(@server.availability_zone, 10, 'VolumeType' => 'io1', 'Iops' => 101)
     end
 
+    # iops invalid value (lower than 100)
+    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1', 'Iops' => 99)").raises(Fog::Compute::AWS::Error) do
+      Fog::Compute[:aws].create_volume(@server.availability_zone, 10, 'VolumeType' => 'io1', 'Iops' => 99)
+    end
+
+    # iops invalid value (greater than 1000)
+    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1', 'Iops' => 1001)").raises(Fog::Compute::AWS::Error) do
+      Fog::Compute[:aws].create_volume(@server.availability_zone, 1000, 'VolumeType' => 'io1', 'Iops' => 1001)
+    end
+
     @volume.destroy
   end