fog 1.3.1 → 1.4.0

data/tests/aws/requests/compute/internet_gateway_tests.rb

@@ -0,0 +1,44 @@
+Shindo.tests('Fog::Compute[:aws] | internet_gateway requests', ['aws']) do
+
+  @internet_gateways_format = {
+    'internetGatewaySet' => [{
+      'internetGatewayId'        => String,
+      'attachmentSet'            => Hash,
+      'tagSet'                   => Fog::Nullable::Hash,
+    }],
+    'requestId' => String
+  }
+
+  tests('success') do
+    @vpc=Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
+    @vpc_id = @vpc.id
+    @subnet=Fog::Compute[:aws].subnets.create('vpc_id' => @vpc_id, 'cidr_block' => '10.0.10.0/24')
+    @subnet_id = @subnet.subnet_id
+    @igw_id = nil
+
+
+    tests('#create_internet_gateway').formats(@internet_gateways_format) do
+      data = Fog::Compute[:aws].create_internet_gateway().body
+      @igw_id = data['internetGatewaySet'].first['internetGatewayId']
+      data
+    end
+
+    tests('#describe_internet_gateways').formats(@internet_gateways_format) do
+      Fog::Compute[:aws].describe_internet_gateways.body
+    end
+
+    tests("#attach_internet_gateway('#{@igw_id}, #{@vpc_id}')").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].attach_internet_gateway(@igw_id, @vpc_id).body
+    end
+
+    tests("#detach_internet_gateway('#{@igw_id}, #{@vpc_id}')").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].detach_internet_gateway(@igw_id, @vpc_id).body
+    end
+
+    tests("#delete_internet_gateway('#{@igw_id}')").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].delete_internet_gateway(@igw_id).body
+    end
+    @subnet.destroy
+    @vpc.destroy
+  end
+end

data/tests/aws/requests/compute/network_interface_tests.rb

@@ -0,0 +1,175 @@
+Shindo.tests('Fog::Compute[:aws] | network interface requests', ['aws']) do
+
+  @network_interface_format = {
+    'networkInterfaceId' => String,
+    'subnetId'           => String,
+    'vpcId'              => String,
+    'availabilityZone'   => String,
+    'description'        => Fog::Nullable::String,
+    'ownerId'            => String,
+    'requesterId'        => Fog::Nullable::String,
+    'requesterManaged'   => String,
+    'status'             => String,
+    'macAddress'         => String,
+    'privateIpAddress'   => String,
+    'privateDnsName'     => Fog::Nullable::String,
+    'sourceDestCheck'    => Fog::Boolean,
+    'groupSet'           => Fog::Nullable::Hash,
+    'attachment'         => Hash,
+    'association'        => Hash,
+    'tagSet'             => Hash
+  }
+
+  @network_interface_create_format = {
+    'networkInterface' => @network_interface_format,
+    'requestId' => String
+  }
+
+  @network_interfaces_format = {
+    'requestId'           => String,
+    'networkInterfaceSet' => [ @network_interface_format ]
+  }
+
+  @attach_network_interface_format = {
+    'requestId'    => String,
+    'attachmentId' => String
+  }
+
+  tests('success') do
+    # Create environment
+    @vpc            = Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
+    @subnet         = Fog::Compute[:aws].subnets.create('vpc_id' => @vpc.id, 'cidr_block' => '10.0.10.16/28')
+    @security_group = Fog::Compute[:aws].security_groups.create('name' => 'sg_name', 'description' => 'sg_desc', 'vpc_id' => @vpc.id)
+
+    
+    @subnet_id         = @subnet.subnet_id
+    @security_group_id = @security_group.group_id
+
+    DESCRIPTION = "Small and green"
+    tests("#create_network_interface(#{@subnet_id})").formats(@network_interface_create_format) do
+      data = Fog::Compute[:aws].create_network_interface(@subnet_id, {"PrivateIpAddress" => "10.0.10.23"}).body
+      @nic_id = data['networkInterface']['networkInterfaceId']
+      data
+    end
+
+    # Describe network interfaces
+    tests('#describe_network_interfaces').formats(@network_interfaces_format) do
+      Fog::Compute[:aws].describe_network_interfaces.body
+    end
+
+    # Describe network interface attribute
+    tests("#describe_network_interface_attribute(#{@nic_id}, 'description')").returns(nil) do
+      Fog::Compute[:aws].describe_network_interface_attribute(@nic_id, 'description').body['description']
+    end
+
+    # test describe of all supported attributes
+    [ 'description', 'groupSet', 'sourceDestCheck', 'attachment'].each do |attrib|
+      tests("#describe_network_interface_attribute(#{@nic_id}, #{attrib})").returns(@nic_id) do
+        Fog::Compute[:aws].describe_network_interface_attribute(@nic_id, attrib).body['networkInterfaceId']
+      end
+    end
+
+    # Modify network interface description attribute
+    tests("#modify_network_interface_attribute(#{@nic_id}, 'description', '#{DESCRIPTION}')").returns(true) do
+      Fog::Compute[:aws].modify_network_interface_attribute(@nic_id, 'description', DESCRIPTION).body["return"]
+    end
+
+    # Describe network interface attribute again
+    tests("#describe_network_interface_attribute(#{@nic_id}, 'description')").returns(DESCRIPTION) do
+      Fog::Compute[:aws].describe_network_interface_attribute(@nic_id, 'description').body["description"]
+    end
+
+    # Restore network interface description attribute
+    tests("#modify_network_interface_attribute(#{@nic_id}, 'description', '')").returns(true) do
+      Fog::Compute[:aws].modify_network_interface_attribute(@nic_id, 'description', '').body["return"]
+    end
+
+    # Check modifying the group set
+    tests("#modify_network_interface_attribute(#{@nic_id}, 'groupSet', [#{@security_group_id}])").returns(true) do
+      Fog::Compute[:aws].modify_network_interface_attribute(@nic_id, 'groupSet', [@security_group_id]).body["return"]
+    end
+    tests("#describe_network_interface_attribute(#{@nic_id}, 'groupSet')").returns({ @security_group_id => "sg_name" }) do
+      Fog::Compute[:aws].describe_network_interface_attribute(@nic_id, 'groupSet').body["groupSet"]
+    end
+
+    # Check modifying the source dest check (and reset)
+    tests("#modify_network_interface_attribute(#{@nic_id}, 'sourceDestCheck', false)").returns(true) do
+      Fog::Compute[:aws].modify_network_interface_attribute(@nic_id, 'sourceDestCheck', false).body["return"]
+    end
+    tests("#describe_network_interface_attribute(#{@nic_id}, 'sourceDestCheck')").returns(false) do
+      Fog::Compute[:aws].describe_network_interface_attribute(@nic_id, 'sourceDestCheck').body["sourceDestCheck"]
+    end
+    tests("#reset_network_interface_attribute(#{@nic_id}, 'sourceDestCheck')").returns(true) do
+      Fog::Compute[:aws].reset_network_interface_attribute(@nic_id, 'sourceDestCheck').body["return"]
+    end
+    tests("#describe_network_interface_attribute(#{@nic_id}, 'sourceDestCheck')").returns(true) do
+      Fog::Compute[:aws].describe_network_interface_attribute(@nic_id, 'sourceDestCheck').body["sourceDestCheck"]
+    end
+
+    @server = Fog::Compute[:aws].servers.create({:flavor_id => 'm1.small', :subnet_id => @subnet_id })
+    @server.wait_for { ready? }
+	@instance_id=@server.id
+
+      # attach
+    tests('#attach_network_interface').formats(@attach_network_interface_format) do
+      data = Fog::Compute[:aws].attach_network_interface(@nic_id, @instance_id, 1).body
+      @attachment_id = data['attachmentId']
+      data
+    end
+
+    # Check modifying the attachment
+    attach_attr = {
+      'attachmentId'        => @attachment_id,
+      'deleteOnTermination' => true
+    }
+    tests("#modify_network_interface_attribute(#{@nic_id}, 'attachment', #{attach_attr.inspect})").returns(true) do
+      Fog::Compute[:aws].modify_network_interface_attribute(@nic_id, 'attachment', attach_attr).body["return"]
+    end
+
+    # detach
+    tests('#detach_network_interface').returns(true) do
+      Fog::Compute[:aws].detach_network_interface(@attachment_id,true).body["return"]
+    end
+    if !Fog.mocking?
+      Fog::Compute[:aws].network_interfaces.get(@nic_id).wait_for { status == 'available'}
+    end
+    # Create network interface with arguments
+    options = {
+      "PrivateIpAddress" => "10.0.10.24",
+      "Description"      => DESCRIPTION,
+      "GroupSet"         => [@security_group_id]
+    }
+    tests("#create_network_interface(#{@subnet_id}), #{options.inspect}").returns("10.0.10.24") do
+      data = Fog::Compute[:aws].create_network_interface(@subnet_id, options).body
+      @nic2_id = data['networkInterface']['networkInterfaceId']
+      data['networkInterface']['privateIpAddress']
+    end
+
+    # Check assigned values
+    tests("#describe_network_interface_attribute(#{@nic2_id}, 'description')").returns(DESCRIPTION) do
+      Fog::Compute[:aws].describe_network_interface_attribute(@nic2_id, 'description').body["description"]
+    end
+    tests("#describe_network_interface_attribute(#{@nic2_id}, 'groupSet'')").returns({ @security_group_id => "sg_name"}) do
+      Fog::Compute[:aws].describe_network_interface_attribute(@nic2_id, 'groupSet').body["groupSet"]
+    end
+
+    # Delete network interfaces
+    tests("#delete_network_interface('#{@nic2_id}')").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].delete_network_interface(@nic2_id).body
+    end
+    tests("#delete_network_interface('#{@nic_id}')").formats(AWS::Compute::Formats::BASIC) do
+     Fog::Compute[:aws].delete_network_interface(@nic_id).body
+    end
+
+    # Clean up resources
+    @server.destroy
+    if !Fog.mocking?
+      @server.wait_for { state == 'terminated' }
+      # despite the fact that the state goes to 'terminated' we need a little delay for aws to do its thing
+	  sleep 5
+    end
+    @security_group.destroy
+    @subnet.destroy
+    @vpc.destroy
+  end
+end

data/tests/aws/requests/compute/security_group_tests.rb

@@ -273,7 +273,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
     end
 
     group_id = Fog::Compute[:aws].describe_security_groups('group-name' => 'vpc_security_group').body['securityGroupInfo'].first['groupId']
-    
+
     permissions = {
       'IpPermissions' => [
         {
@@ -413,9 +413,10 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
     end
 
     broken_params = [
-                     [ 'fog_security_group', { 'GroupName' => 'fog_security_group'}],
-                     [ 'fog_security_group', { 'GroupId' => 'sg-11223344'}],
-                     [ { 'GroupName' => 'fog_security_group', 'GroupId' => 'sg-11223344'}, nil]
+                     ['fog_security_group', { 'GroupName' => 'fog_security_group' }],
+                     [nil, nil],
+                     [nil, { 'GroupId' => nil }],
+                     [nil, { 'GroupName' => nil, 'GroupId' => nil }]
                     ]
 
     broken_params.each do |list_elem|

data/tests/aws/requests/compute/volume_tests.rb

@@ -19,6 +19,34 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
     'volumeId'    => String
   }
 
+  @volume_status_format = {
+    'volumeStatusSet' => [{
+      'availabilityZone'  => String,
+      'volumeId'          => String,
+      'volumeStatus'      => {
+        'status'            => String,
+        'details'           => [{
+          'name'              => String,
+          'status'            => String
+        }]
+      },
+      'actionsSet'        => [{
+        'code'              => String,
+        'description'       => String,
+        'eventId'           => String,
+        'eventType'         => String
+      }],
+      'eventsSet'        => [{
+        'description'       => String,
+        'eventId'           => String,
+        'eventType'         => String,
+        'notBefore'         => Time,
+        'notAfter'          => Time
+      }]
+    }],
+    'requestId' => String
+  }
+
   @volumes_format = {
     'volumeSet' => [{
       'availabilityZone'  => String,
@@ -37,7 +65,6 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
   @server.wait_for { ready? }
 
   tests('success') do
-
     @volume_id = nil
 
     tests('#create_volume').formats(@volume_format) do
@@ -82,6 +109,11 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
       Fog::Compute[:aws].describe_volumes('attachment.device' => '/dev/sdh').body
     end
 
+    tests("#describe_volume_status('volume-id' => #{@volume_id})").formats(@volume_status_format) do
+      pending if Fog.mocking?
+      Fog::Compute[:aws].describe_volume_status('volume-id' => @volume_id).body
+    end
+
     tests("#detach_volume('#{@volume_id}')").formats(@volume_attachment_format) do
       Fog::Compute[:aws].detach_volume(@volume_id).body
     end
@@ -91,10 +123,9 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
     tests("#delete_volume('#{@volume_id}')").formats(AWS::Compute::Formats::BASIC) do
       Fog::Compute[:aws].delete_volume(@volume_id).body
     end
-
   end
-  tests('failure') do
 
+  tests('failure') do
     @volume = Fog::Compute[:aws].volumes.create(:availability_zone => @server.availability_zone, :size => 1)
 
     tests("#attach_volume('i-00000000', '#{@volume.identity}', '/dev/sdh')").raises(Fog::Compute::AWS::NotFound) do
@@ -118,9 +149,7 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
     end
 
     @volume.destroy
-
   end
 
   @server.destroy
-
 end

data/tests/aws/requests/dns/dns_tests.rb

@@ -191,7 +191,7 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
       # create a load balancer
       @elb_connection.create_load_balancer(["us-east-1a"], "fog", [{"Protocol" => "HTTP", "LoadBalancerPort" => "80", "InstancePort" => "80"}])
 
-      elb_response   = @elb_connection.describe_load_balancers("fog")
+      elb_response   = @elb_connection.describe_load_balancers("LoadBalancerNames" => "fog")
       elb            = elb_response.body["DescribeLoadBalancersResult"]["LoadBalancerDescriptions"].first
       hosted_zone_id = elb["CanonicalHostedZoneNameID"]
       dns_name       = elb["DNSName"]

data/tests/aws/requests/dynamodb/item_tests.rb

@@ -43,6 +43,26 @@ Shindo.tests('Fog::AWS[:dynamodb] | item requests', ['aws']) do
       ).body
     end
 
+    @batch_put_item_format = {
+      'Responses'=> {
+        @table_name => {
+          'ConsumedCapacityUnits' => Float}
+      },
+      'UnprocessedItems'=> {}
+    }
+
+    tests("#batch_put_item({ '#{@table_name}' => [{ 'PutRequest' => { 'Item' =>
+            { 'HashKeyElement' => { 'S' => 'key' }, 'RangeKeyElement' => { 'S' => 'key' }}}}]})"
+         ).formats(@batch_put_item_format) do
+            pending if Fog.mocking?
+            Fog::AWS[:dynamodb].batch_put_item(
+              {@table_name => [{'PutRequest'=> {'Item'=>
+                {'HashKeyElement' => { 'S' => 'key' },
+                 'RangeKeyElement' => { 'S' => 'key' }
+                }}}]}
+            ).body
+         end
+
     @get_item_format = {
       'ConsumedCapacityUnits' => Float,
       'Item' => {

data/tests/aws/requests/elb/helper.rb

@@ -18,6 +18,7 @@ class AWS
         "LoadBalancerName" => String,
         "Policies" => {"LBCookieStickinessPolicies" => Array, "AppCookieStickinessPolicies" => Array},
         "SourceSecurityGroup" => {"GroupName" => String, "OwnerAlias" => String},
+        "Scheme" => String
       }
 
       CREATE_LOAD_BALANCER = BASIC.merge({

data/tests/aws/requests/elb/load_balancer_tests.rb

@@ -16,7 +16,7 @@ Shindo.tests('AWS::ELB | load_balancer_tests', ['aws', 'elb']) do
     end
 
     tests('#describe_load_balancers with bad lb') do
-      raises(Fog::AWS::ELB::NotFound) { Fog::AWS[:elb].describe_load_balancers('none-such-lb') }
+      raises(Fog::AWS::ELB::NotFound) { Fog::AWS[:elb].describe_load_balancers('LoadBalancerNames' => 'none-such-lb') }
     end
 
     tests("#describe_load_balancers with SSL listener") do
@@ -25,7 +25,7 @@ Shindo.tests('AWS::ELB | load_balancer_tests', ['aws', 'elb']) do
         {'Protocol' => 'HTTPS', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => @certificate['Arn']},
       ]
       Fog::AWS[:elb].create_load_balancer_listeners(@load_balancer_id, listeners)
-      response = Fog::AWS[:elb].describe_load_balancers(@load_balancer_id).body
+      response = Fog::AWS[:elb].describe_load_balancers('LoadBalancerNames' => @load_balancer_id).body
       tests("SSLCertificateId is set").returns(@certificate['Arn']) do
         listeners = response["DescribeLoadBalancersResult"]["LoadBalancerDescriptions"].first["ListenerDescriptions"]
         listeners.find {|l| l["Listener"]["Protocol"] == 'HTTPS' }["Listener"]["SSLCertificateId"]

data/tests/aws/requests/iam/role_tests.rb

@@ -0,0 +1,168 @@
+Shindo.tests('AWS::IAM | role requests', ['aws']) do
+  tests('success') do
+
+    @role = {
+        'Arn'       => String,
+        'AssumeRolePolicyDocument' => String,
+        'CreateDate' => Time,
+        'Path'      => String,
+        'RoleId'    => String,
+        'RoleName'  => String
+      }
+    @role_format = {
+      'Role' => @role,
+      'RequestId' => String
+    }
+    tests("#create_role('fogrole')").formats(@role_format) do
+      pending if Fog.mocking?
+      Fog::AWS[:iam].create_role('fogrole', Fog::AWS::IAM::EC2_ASSUME_ROLE_POLICY).body
+    end
+
+    tests("#get_role('fogrole')").formats(@role_format) do
+      pending if Fog.mocking?
+      Fog::AWS[:iam].get_role('fogrole').body
+    end
+
+    @list_roles_format = {
+      'Roles' => [{
+        'Arn'       => String,
+        'AssumeRolePolicyDocument' => String,
+        'CreateDate' => Time,
+        'Path'      => String,
+        'RoleId'    => String,
+        'RoleName'  => String
+      }],
+      'RequestId' => String,
+      'IsTruncated' => Fog::Boolean,
+    }
+
+    tests("#list_roles").formats(@list_roles_format) do
+      pending if Fog.mocking?
+      body = Fog::AWS[:iam].list_roles.body
+      returns(true){!! body['Roles'].detect {|role| role['RoleName'] == 'fogrole'}}
+      body
+    end
+
+    @profile_format = {
+      'InstanceProfile' => {
+        'Arn'       => String,
+        'CreateDate' => Time,
+        'Path'      => String,
+        'InstanceProfileId'    => String,
+        'InstanceProfileName'  => String,
+        'Roles' => [@role]
+      },
+      'RequestId' => String
+      
+    }
+    tests("#create_instance_profile('fogprofile')").formats(@profile_format) do
+      pending if Fog.mocking?
+      Fog::AWS[:iam].create_instance_profile('fogprofile').body
+    end
+
+    tests("#get_instance_profile('fogprofile')").formats(@profile_format) do
+      pending if Fog.mocking?
+      Fog::AWS[:iam].get_instance_profile('fogprofile').body
+    end
+
+    tests("#add_role_to_instance_profile('fogprofile','fogrole')").formats(AWS::IAM::Formats::BASIC) do
+      pending if Fog.mocking?
+      Fog::AWS[:iam].add_role_to_instance_profile('fogrole', 'fogprofile').body
+    end
+
+    @profiles_format = {
+      'InstanceProfiles' => [{
+        'Arn'       => String,
+        'CreateDate' => Time,
+        'Path'      => String,
+        'InstanceProfileId'    => String,
+        'InstanceProfileName'  => String,
+        'Roles' => [@role]
+      }],
+      'IsTruncated' => Fog::Boolean,
+      'RequestId' => String
+      
+    }
+    tests("list_instance_profiles_for_role('fogrole')").formats(@profiles_format) do
+      pending if Fog.mocking?
+      body = Fog::AWS[:iam].list_instance_profiles_for_role('fogrole').body
+      returns(['fogprofile']) { body['InstanceProfiles'].collect {|hash| hash['InstanceProfileName']}}      
+      body
+    end
+
+    tests("list_instance_profiles").formats(@profiles_format) do
+      pending if Fog.mocking?
+      Fog::AWS[:iam].list_instance_profiles.body
+    end
+
+    sample_policy = {"Statement" => [{"Effect" => "Allow", "Action" => "*", "Resource" => "*"}]}
+    
+    tests("put_role_policy").formats(AWS::IAM::Formats::BASIC) do
+      pending if Fog.mocking?
+      Fog::AWS[:iam].put_role_policy('fogrole', 'fogpolicy', sample_policy).body
+    end
+
+    @get_role_policy_format = {
+      'Policy' => {
+        'RoleName' => String, 
+        'PolicyName' => String,
+        'PolicyDocument' => Hash,
+      },
+      'RequestId' => String
+    }
+
+    tests("get_role_policy").formats(@get_role_policy_format) do
+      pending if Fog.mocking?
+      body = Fog::AWS[:iam].get_role_policy('fogrole','fogpolicy').body
+      returns('fogpolicy') {body['Policy']['PolicyName']}
+      returns(sample_policy){body['Policy']['PolicyDocument']}
+      body
+    end
+
+    @list_role_policies_format = {
+      'PolicyNames' => [String],
+      'IsTruncated' => Fog::Boolean,
+      'RequestId' => String      
+    }
+
+    tests("list_role_policies").formats(@list_role_policies_format) do
+      pending if Fog.mocking?
+      body = Fog::AWS[:iam].list_role_policies('fogrole').body
+
+      returns(['fogpolicy']) {body['PolicyNames']}
+      body
+    end
+
+    tests("delete_role_policy").formats(AWS::IAM::Formats::BASIC) do
+      pending if Fog.mocking?
+      Fog::AWS[:iam].delete_role_policy('fogrole', 'fogpolicy').body
+    end
+    
+    returns([]) do
+      pending if Fog.mocking?
+      Fog::AWS[:iam].list_role_policies('fogrole').body['PolicyNames']
+    end
+
+    tests("remove_role_from_instance_profile").formats(AWS::IAM::Formats::BASIC) do
+      pending if Fog.mocking?
+      Fog::AWS[:iam].remove_role_from_instance_profile('fogrole', 'fogprofile').body
+    end
+
+    returns([]) do
+      pending if Fog.mocking?
+      Fog::AWS[:iam].list_instance_profiles_for_role('fogrole').body['InstanceProfiles']
+    end
+
+    tests("#delete_instance_profile('fogprofile'").formats(AWS::IAM::Formats::BASIC) do
+      pending if Fog.mocking?
+      Fog::AWS[:iam].delete_instance_profile('fogprofile').body
+    end
+
+    tests("#delete_role('fogrole'").formats(AWS::IAM::Formats::BASIC) do
+      pending if Fog.mocking?
+      Fog::AWS[:iam].delete_role('fogrole').body
+    end
+  end
+
+end
+