fog-maestrodev 1.19.0.20140212012611 → 1.20.0.20140305101305

data/lib/fog/xenserver/models/compute/storage_manager.rb

@@ -11,7 +11,7 @@ module Fog
 
         attribute :capabilities
         attribute :configuration
-        attribtue :copyright
+        attribute :copyright
         attribute :driver_filename
         attribute :features
         attribute :description,               :aliases => :name_description

data/lib/fog/zerigo.rb

@@ -1,11 +1 @@
-require 'fog/core'
-
-module Fog
-  module Zerigo
-
-    extend Fog::Provider
-
-    service(:dns, 'zerigo/dns', 'DNS')
-
-  end
-end
+require 'fog/zerigo/dns'

data/lib/fog/zerigo/core.rb

@@ -0,0 +1,11 @@
+require 'fog/core'
+
+module Fog
+  module Zerigo
+
+    extend Fog::Provider
+
+    service(:dns, 'DNS')
+
+  end
+end

data/lib/fog/zerigo/dns.rb

@@ -1,4 +1,4 @@
-require 'fog/zerigo'
+require 'fog/zerigo/core'
 require 'fog/dns'
 
 module Fog

data/lib/tasks/changelog_task.rb

@@ -53,6 +53,7 @@ module Fog
           for committer, commits in committers.to_a.sort {|x,y| y[1] <=> x[1]}
             if [
               'Aaron Suggs',
+              'Ash Wilson',
               'Brian Hartsock',
               'Chris Roberts',
               'Christopher Oliver',
@@ -69,6 +70,7 @@ module Fog
               'Luqman Amjad',
               'Michael Zeng',
               'Mike Hagedorn',
+              'Mike Pountney',
               'Nat Welch',
               'Nick Osborn',
               'nightshade427',

data/tests/aws/models/compute/network_acl_tests.rb

@@ -0,0 +1,109 @@
+Shindo.tests("Fog::Compute[:aws] | network_acl", ['aws']) do
+  @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')
+
+  model_tests(Fog::Compute[:aws].network_acls, { :vpc_id => @vpc.id }, true)
+
+  tests("associate_with") do
+    @new_nacl     = Fog::Compute[:aws].network_acls.create(:vpc_id => @vpc.id)
+    @default_nacl = Fog::Compute[:aws].network_acls.all('vpc-id' => @vpc.id, 'default' => true).first
+
+    test("associate_with new_nacl") do
+      @new_nacl.associate_with(@subnet)
+    end
+
+    @new_nacl.reload
+
+    test("associate_with correctly updates new_nacl") do
+      @new_nacl.associations.collect { |a| a['subnetId'] } == [@subnet.subnet_id]
+    end
+
+    @default_nacl.associate_with(@subnet)
+    @new_nacl.reload
+    @default_nacl.reload
+
+    test("associate_with correctly updates new_nacl after removal") do
+      @new_nacl.associations.collect { |a| a['subnetId'] } == []
+    end
+
+    test("associate_with correctly updates default_nacl after removal") do
+      @default_nacl.associations.collect { |a| a['subnetId'] } == [@subnet.subnet_id]
+    end
+
+    @new_nacl.destroy
+  end
+
+  tests("add_rule and remove_rule") do
+    @new_nacl = Fog::Compute[:aws].network_acls.create(:vpc_id => @vpc.id)
+    default_rules = @new_nacl.entries.dup
+
+    test("add a new inbound rule") do
+      @new_nacl.add_inbound_rule(100, Fog::Compute::AWS::NetworkAcl::TCP, 'allow', '0.0.0.0/0', 'PortRange.From' => 22, 'PortRange.To' => 22)
+      @new_nacl.reload
+      (@new_nacl.entries - default_rules) == [{
+        "icmpTypeCode" => {},
+        "portRange"    => {
+          "from"       => 22,
+          "to"         => 22
+        },
+        "ruleNumber"   => 100,
+        "protocol"     => 6,
+        "ruleAction"   => "allow",
+        "egress"       => false,
+        "cidrBlock"    => "0.0.0.0/0"
+      }]
+    end
+
+    test("remove inbound rule") do
+      @new_nacl.remove_inbound_rule(100)
+      @new_nacl.reload
+      @new_nacl.entries == default_rules
+    end
+
+    test("add a new outbound rule") do
+      @new_nacl.add_outbound_rule(100, Fog::Compute::AWS::NetworkAcl::TCP, 'allow', '0.0.0.0/0', 'PortRange.From' => 22, 'PortRange.To' => 22)
+      @new_nacl.reload
+      (@new_nacl.entries - default_rules) == [{
+        "icmpTypeCode" => {},
+        "portRange"    => {
+          "from"       => 22,
+          "to"         => 22
+        },
+        "ruleNumber"   => 100,
+        "protocol"     => 6,
+        "ruleAction"   => "allow",
+        "egress"       => true,
+        "cidrBlock"    => "0.0.0.0/0"
+      }]
+    end
+
+    test("remove outbound rule") do
+      @new_nacl.remove_outbound_rule(100)
+      @new_nacl.reload
+      @new_nacl.entries == default_rules
+    end
+
+    test("update rule") do
+      @new_nacl.add_inbound_rule(100, Fog::Compute::AWS::NetworkAcl::TCP, 'allow', '0.0.0.0/0', 'PortRange.From' => 22, 'PortRange.To' => 22)
+      @new_nacl.update_inbound_rule(100, Fog::Compute::AWS::NetworkAcl::TCP, 'allow', '10.0.0.0/8', 'PortRange.From' => 22, 'PortRange.To' => 22)
+      @new_nacl.reload
+      (@new_nacl.entries - default_rules) == [{
+        "icmpTypeCode" => {},
+        "portRange"    => {
+          "from"       => 22,
+          "to"         => 22
+        },
+        "ruleNumber"   => 100,
+        "protocol"     => 6,
+        "ruleAction"   => "allow",
+        "egress"       => false,
+        "cidrBlock"    => "10.0.0.0/8"
+      }]
+    end
+
+    @new_nacl.destroy
+  end
+
+  @subnet.destroy
+  @vpc.destroy 
+end

data/tests/aws/models/compute/network_acls_tests.rb

@@ -0,0 +1,7 @@
+Shindo.tests("Fog::Compute[:aws] | network_acls", ['aws']) do
+  @vpc = Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
+
+  collection_tests(Fog::Compute[:aws].network_acls, { :vpc_id => @vpc.id }, true)
+  
+  @vpc.destroy
+end

data/tests/aws/models/elasticache/subnet_groups_tests.rb

@@ -0,0 +1,44 @@
+Shindo.tests('AWS::Elasticache | subnet group', ['aws', 'elasticache']) do
+  # random_differentiator
+  # Useful when rapidly re-running tests, so we don't have to wait
+  # serveral minutes for deleted VPCs/subnets to disappear
+  suffix = rand(65536).to_s(16)
+  @subnet_group_name = "fog-test-#{suffix}"
+
+  vpc_range = rand(245) + 10
+  @vpc = Fog::Compute[:aws].vpcs.create('cidr_block' => "10.#{vpc_range}.0.0/16")
+
+  # Create 4 subnets in this VPC, each one in a different AZ
+  subnet_az = 'us-east-1a'
+  subnet_range = 8
+  @subnets = (1..3).map do
+    result = Fog::Compute[:aws].create_subnet(@vpc.id, "10.#{vpc_range}.#{subnet_range}.0/24",
+                                              'AvailabilityZone' => subnet_az)
+    puts result
+    subnet = result.body['subnet']
+    subnet_az = subnet_az.succ
+    subnet_range *= 2
+    subnet
+  end
+
+  tests('success') do
+    group_name = 'fog-test'
+    description = 'Fog Test'
+    subnet_ids = @subnets.map { |sn| sn['subnetId'] }.to_a
+
+    model_tests(
+      AWS[:elasticache].subnet_groups,
+      {:name => group_name, :subnet_ids => subnet_ids, :description => description}, true
+    )
+
+    collection_tests(
+      AWS[:elasticache].subnet_groups,
+      {:name => group_name, :subnet_ids => subnet_ids, :description => description}, true
+    )
+  end
+
+  @subnets.each do |sn|
+    Fog::Compute[:aws].delete_subnet(sn['subnetId'])
+  end
+  @vpc.destroy
+end

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

@@ -0,0 +1,86 @@
+Shindo.tests('Fog::Compute[:aws] | network acl requests', ['aws']) do
+
+  @network_acl_format = {
+    'networkAclId'   => String,
+    'vpcId'          => String,
+    'default'        => Fog::Boolean,
+    'entrySet'       => [{
+      'ruleNumber'   => Integer,
+      'protocol'     => Integer,
+      'ruleAction'   => String,
+      'egress'       => Fog::Boolean,
+      'cidrBlock'    => String,
+      'icmpTypeCode' => {
+        'code'       => Fog::Nullable::Integer,
+        'type'       => Fog::Nullable::Integer
+      },
+      'portRange' => {
+        'from'       => Fog::Nullable::Integer,
+        'to'         => Fog::Nullable::Integer
+      }
+    }],
+    'associationSet' => Array,
+    'tagSet'         => Hash
+  }
+
+  @network_acls_format = {
+    'requestId'     => String,
+    'networkAclSet' => [ @network_acl_format ]
+  }
+
+  @network_acl_replace_association = {
+    'requestId'        => String,
+    'newAssociationId' => String
+  }
+
+  tests('success') do
+    @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')
+    @network_acl = nil
+
+    # Describe network interfaces
+    tests('#describe_network_acls').formats(@network_acls_format) do
+      Fog::Compute[:aws].describe_network_acls.body
+    end
+
+    tests('#create_network_acl').formats(@network_acl_format) do
+      data = Fog::Compute[:aws].create_network_acl(@vpc.id).body
+
+      @network_acl = data['networkAcl']
+      data['networkAcl']
+    end
+
+    tests("#create_network_acl_entry").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].create_network_acl_entry(@network_acl['networkAclId'], 100, 6, 'allow', '0.0.0.0/8', false, 'PortRange.From' => 22, 'PortRange.To' => 22).body
+    end
+
+    tests("#replace_network_acl_entry").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].replace_network_acl_entry(@network_acl['networkAclId'], 100, 6, 'deny', '0.0.0.0/8', false, 'PortRange.From' => 22, 'PortRange.To' => 22).body
+    end
+
+    tests("#delete_network_acl_entry").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].delete_network_acl_entry(@network_acl['networkAclId'], 100, false).body
+    end
+
+    default_acl = Fog::Compute[:aws].describe_network_acls('vpc-id' => @vpc.id, 'default' => true).body['networkAclSet'].first
+    @assoc_id   = default_acl['associationSet'].first['networkAclAssociationId']
+
+    tests("#replace_network_acl_association").formats(@network_acl_replace_association) do
+      data = Fog::Compute[:aws].replace_network_acl_association(@assoc_id, @network_acl['networkAclId']).body
+      @assoc_id = data['newAssociationId']
+      data
+    end
+
+    tests("#replace_network_acl_association").formats(@network_acl_replace_association) do
+      Fog::Compute[:aws].replace_network_acl_association(@assoc_id, default_acl['networkAclId']).body
+    end
+
+    tests('#delete_network_acl').formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].delete_network_acl(@network_acl['networkAclId']).body
+    end
+
+    # Clean up
+    @subnet.destroy
+    @vpc.destroy
+  end
+end

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

@@ -2,7 +2,7 @@ Shindo.tests('Fog::Compute[:aws] | route table requests', ['aws']) do
 
   @route_table_format = {
     'routeTable' => [{
-      'routeSet'        => [{ 
+      'routeSet'        => [{
         'destinationCidrBlock'  => String,
         'gatewayId'             => String,
         'state'                 => String,
@@ -43,9 +43,10 @@ Shindo.tests('Fog::Compute[:aws] | route table requests', ['aws']) do
   if !Fog.mocking?
     vpc.wait_for { state.eql? "available" }
   end
-  @subnet_id = Fog::Compute[:aws].create_subnet(vpc.id, '10.0.10.0/24').body['subnetSet'].first['subnetId']
+  @subnet_id = Fog::Compute[:aws].create_subnet(vpc.id, '10.0.10.0/24').body['subnet']['subnetId']
   @network_interface = Fog::Compute[:aws].create_network_interface(@subnet_id, {"PrivateIpAddress" => "10.0.10.23"}).body
   @internet_gateway_id = Fog::Compute[:aws].create_internet_gateway.body['internetGatewaySet'].first['internetGatewayId']
+  @alt_internet_gateway_id = Fog::Compute[:aws].create_internet_gateway.body['internetGatewaySet'].first['internetGatewayId']
   @network_interface_id = @network_interface['networkInterface']['networkInterfaceId']
   key_name = 'fog-test-key'
   key = Fog::Compute[:aws].key_pairs.create(:name => key_name)
@@ -91,6 +92,26 @@ Shindo.tests('Fog::Compute[:aws] | route table requests', ['aws']) do
       Fog::Compute[:aws].create_route(@route_table_id, '10.0.10.0/21', nil, nil, @network_interface_id).body
     end
 
+    # Tests replace_route
+    #   - using internet gateway
+    #   - using instance id
+    #   - using network interface
+    #
+    Fog::Compute[:aws].attach_internet_gateway(@alt_internet_gateway_id, vpc.id).body
+    tests("#replace_route('#{@route_table_id}', '#{@destination_cidr_block}', {'gatewayId' => '#{@alt_internet_gateway_id}'})").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].replace_route(@route_table_id, @destination_cidr_block, {'gatewayId' => @alt_internet_gateway_id}).body
+    end
+
+    instance = Fog::Compute[:aws].servers.create(:image_id => @ami, :flavor_id => 't1.micro', :key_name => 'fog-test-key', :subnet_id => @subnet_id)
+    instance.wait_for { state.eql? "running" }
+    tests("#replace_route('#{@route_table_id}', '10.0.10.0/22', {'instanceId' => '#{instance.id}'})").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].replace_route(@route_table_id, '10.0.10.0/22', {'instanceId' => instance.id}).body
+    end
+
+    tests("#replace_route('#{@route_table_id}', '10.0.10.0/21', {'networkInterfaceId' => '#{@network_interface_id}'})").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].replace_route(@route_table_id, '10.0.10.0/21', {'networkInterfaceId' => @network_interface_id}).body
+    end
+
     # Tests describe_route_tables
     #   - no parameters
     #   - filter: vpc-id => vpc_id
@@ -212,6 +233,46 @@ Shindo.tests('Fog::Compute[:aws] | route table requests', ['aws']) do
       end
     end
 
+    # Tests replace_route
+    #   - no parameters
+    #   - passing a nonexisiting route table and an exisiting internet gateway
+    #   - passing a nonexisiting route table
+    #   - passing a nonexisting route table and an exisiting instance
+    #   - passing a nonexisiting instance
+    #   - passing a nonexsiting route table and an exisiting network interface
+    #   - passing a nonexisiting network interface
+    #   - attempting to add a route at a less specific destination cidr block
+    #
+    tests('#replace_route').raises(ArgumentError) do
+      Fog::Compute[:aws].replace_route
+    end
+    tests("#replace_route('rtb-00000000', '#{@destination_cidr_block}', {'internetGatewayId' => '#{@internet_gateway_id}'})").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].replace_route('rtb-00000000', @destination_cidr_block, {'internetGatewayId' => @internet_gateway_id})
+    end
+    tests("#replace_route('rtb-00000000', '#{@destination_cidr_block}')").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].replace_route('rtb-00000000', @destination_cidr_block)
+    end
+    tests("#replace_route('#{@route_table_id}', '#{@destination_cidr_block}', {'gatewayId' => 'igw-00000000'})").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].replace_route(@route_table_id, @destination_cidr_block, {'gatewayId' => 'igw-00000000'})
+    end
+    tests("#replace_route('rtb-00000000', '#{@destination_cidr_block}', {'instanceId' => '#{instance.id}'})").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].replace_route('rtb-00000000', @destination_cidr_block, {'instanceId' => instance.id})
+    end
+    tests("#replace_route('#{@route_table_id}', '#{@destination_cidr_block}', {'instanceId' => 'i-00000000'})").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].replace_route(@route_table_id, @destination_cidr_block, {'instanceId' => 'i-00000000'})
+    end
+    tests("#replace_route('#{@route_table_id}', '#{@destination_cidr_block}', {'networkInterfaceId' => 'eni-00000000'})").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].replace_route(@route_table_id, @destination_cidr_block, {'networkInterfaceId' => 'eni-00000000'})
+    end
+    tests("#replace_route('rtb-00000000', '#{@destination_cidr_block}', {'networkInterfaceId' => '#{@network_interface_id}'})").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].replace_route('rtb-00000000', @destination_cidr_block, {'networkInterfaceId' => @network_interface_id})
+    end
+    if !Fog.mocking?
+      tests("#replace_route less specific destination_cidr_block").raises(Fog::Compute::AWS::Error) do
+        Fog::Compute[:aws].replace_route(@route_table_id, '10.0.10.0/25', {'gatewayId' => @internet_gateway_id})
+      end
+    end
+
     # Test describe_route_tables
     #   - passing a nonexisiting vpc
     #
@@ -267,7 +328,7 @@ Shindo.tests('Fog::Compute[:aws] | route table requests', ['aws']) do
     Fog::Compute[:aws].disassociate_route_table(@association_id)
     Fog::Compute[:aws].delete_route_table(@route_table_id)
   end
-  
+
   Fog::Compute[:aws].delete_network_interface(@network_interface_id)
   Fog::Compute[:aws].detach_internet_gateway(@internet_gateway_id, vpc.id)
   Fog::Compute[:aws].delete_internet_gateway(@internet_gateway_id)

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

@@ -1,15 +1,22 @@
 Shindo.tests('Fog::Compute[:aws] | subnet requests', ['aws']) do
 
+  @subnet_format = {
+    'subnetId'                 => String,
+    'state'                    => String,
+    'vpcId'                    => String,
+    'cidrBlock'                => String,
+    'availableIpAddressCount'  => String,
+    'availabilityZone'         => String,
+    'tagSet'                   => Hash,
+  }
+
+  @single_subnet_format = {
+    'subnet'    => @subnet_format,
+    'requestId' => String,
+  }
+
   @subnets_format = {
-    'subnetSet' => [{
-      'subnetId'                 => String,
-      'state'                    => String,
-      'vpcId'                    => String,
-      'cidrBlock'                => String,
-      'availableIpAddressCount'  => String,
-      'availabilityZone'         => String,
-      'tagSet'                   => Hash,
-    }],
+    'subnetSet' => [@subnet_format],
     'requestId' => String
   }
 
@@ -18,9 +25,9 @@ Shindo.tests('Fog::Compute[:aws] | subnet requests', ['aws']) do
     @vpc_id = @vpc.id
     @subnet_id = nil
 
-    tests('#create_subnet').formats(@subnets_format) do
+    tests('#create_subnet').formats(@single_subnet_format) do
       data = Fog::Compute[:aws].create_subnet(@vpc_id, '10.0.10.16/28').body
-      @subnet_id = data['subnetSet'].first['subnetId']
+      @subnet_id = data['subnet']['subnetId']
       data
     end