(dis)associate address spec

lib/fog/aws/requests/ec2/associate_address.rb

@@ -1,26 +1,59 @@
-module Fog
-  module AWS
-    class EC2
+unless Fog.mocking?
+
+  module Fog
+    module AWS
+      class EC2
+
+        # Associate an elastic IP address with an instance
+        #
+        # ==== Parameters
+        # * instance_id<~String> - Id of instance to associate address with
+        # * public_ip<~String> - Public ip to assign to instance
+        #
+        # ==== Returns
+        # * response<~Fog::AWS::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * 'return'<~Boolean> - success?
+        def associate_address(instance_id, public_ip)
+          request({
+            'Action' => 'AssociateAddress',
+            'InstanceId' => instance_id,
+            'PublicIp' => public_ip
+          }, Fog::Parsers::AWS::EC2::Basic.new)
+        end
 
-      # Associate an elastic IP address with an instance
-      #
-      # ==== Parameters
-      # * instance_id<~String> - Id of instance to associate address with
-      # * public_ip<~String> - Public ip to assign to instance
-      #
-      # ==== Returns
-      # * response<~Fog::AWS::Response>:
-      #   * body<~Hash>:
-      #     * 'requestId'<~String> - Id of request
-      #     * 'return'<~Boolean> - success?
-      def associate_address(instance_id, public_ip)
-        request({
-          'Action' => 'AssociateAddress',
-          'InstanceId' => instance_id,
-          'PublicIp' => public_ip
-        }, Fog::Parsers::AWS::EC2::Basic.new)
       end
-
     end
   end
-end
+
+else
+
+  module Fog
+    module AWS
+      class EC2
+
+        def associate_address(instance_id, public_ip)
+          response = Fog::Response.new
+          response.status = 200
+          address = Fog::AWS::EC2.data[:addresses][public_ip]
+          instance = Fog::AWS::EC2.data[:instances][instance_id]
+          if address && instance
+            instance['instanceId'] = instance_id
+            response.status = 200
+            response.body = {
+              'requestId' => Fog::AWS::Mock.request_id,
+              'return'    => true
+            }
+          else
+            response.status = 400
+            raise(Fog::Errors.status_error(200, 400, response))
+          end
+          response
+        end
+
+      end
+    end
+  end
+
+end

lib/fog/aws/requests/ec2/disassociate_address.rb

@@ -1,24 +1,55 @@
-module Fog
-  module AWS
-    class EC2
+unless Fog.mocking?
+
+  module Fog
+    module AWS
+      class EC2
+
+        # Disassociate an elastic IP address from its instance (if any)
+        #
+        # ==== Parameters
+        # * public_ip<~String> - Public ip to assign to instance
+        #
+        # ==== Returns
+        # * response<~Fog::AWS::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * 'return'<~Boolean> - success?
+        def disassociate_address(public_ip)
+          request({
+            'Action' => 'DisassociateAddress',
+            'PublicIp' => public_ip
+          }, Fog::Parsers::AWS::EC2::Basic.new)
+        end
 
-      # Disassociate an elastic IP address from its instance (if any)
-      #
-      # ==== Parameters
-      # * public_ip<~String> - Public ip to assign to instance
-      #
-      # ==== Returns
-      # * response<~Fog::AWS::Response>:
-      #   * body<~Hash>:
-      #     * 'requestId'<~String> - Id of request
-      #     * 'return'<~Boolean> - success?
-      def disassociate_address(public_ip)
-        request({
-          'Action' => 'DisassociateAddress',
-          'PublicIp' => public_ip
-        }, Fog::Parsers::AWS::EC2::Basic.new)
       end
-
     end
   end
-end
+
+else
+
+  module Fog
+    module AWS
+      class EC2
+
+        def disassociate_address(public_ip)
+          response = Fog::Response.new
+          response.status = 200
+          if address = Fog::AWS::EC2.data[:addresses][public_ip]
+            address['instanceId'] = ''
+            response.status = 200
+            response.body = {
+              'requestId' => Fog::AWS::Mock.request_id,
+              'return'    => true
+            }
+          else
+            response.status = 400
+            raise(Fog::Errors.status_error(200, 400, response))
+          end
+          response
+        end
+
+      end
+    end
+  end
+
+end

spec/aws/requests/ec2/associate_address_spec.rb

@@ -10,7 +10,7 @@ describe 'EC2.associate_address' do
 
     after(:each) do
       ec2.release_address(@public_ip)
-      ec2.terminate_instances([@instance_id])
+      ec2.terminate_instances(@instance_id)
     end
 
     it "should return proper attributes" do
@@ -20,4 +20,23 @@ describe 'EC2.associate_address' do
     end
 
   end
+  describe 'failure' do
+
+    it "should raise a BadRequest error if the instance does not exist" do
+      @public_ip = ec2.allocate_address.body['publicIp']
+      lambda {
+        ec2.associate_address('i-00000000', @public_ip)
+      }.should raise_error(Fog::Errors::BadRequest)
+      ec2.release_address(@public_ip)
+    end
+
+    it "should raise a BadRequest error if the address does not exist" do
+      @instance_id = ec2.run_instances('ami-5ee70037', 1, 1).body['instancesSet'].first['instanceId']
+      lambda {
+        ec2.associate_address(@instance_id, '127.0.0.1')
+      }.should raise_error(Fog::Errors::BadRequest)
+      ec2.terminate_instances(@instance_id)
+    end
+
+  end
 end

spec/aws/requests/ec2/disassociate_address_spec.rb

@@ -21,4 +21,15 @@ describe 'EC2.disassociate_address' do
     end
 
   end
+
+  describe 'failure' do
+
+    it "should raise a BadRequest error if the address does not exist" do
+      lambda {
+        ec2.disassociate_address('127.0.0.1')
+      }.should raise_error(Fog::Errors::BadRequest)
+    end
+
+  end
+
 end