fog 1.19.0 → 1.20.0

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
 

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

@@ -16,6 +16,25 @@ class AWS
       SINGLE_SECURITY_GROUP = BASIC.merge('CacheSecurityGroup' => SECURITY_GROUP)
       DESCRIBE_SECURITY_GROUPS = {'CacheSecurityGroups' => [SECURITY_GROUP]}
 
+      CACHE_SUBNET_GROUP = {
+        'CacheSubnetGroupName' => String,
+        'CacheSubnetGroupDescription' => String,
+        'VpcId' => String,
+        'Subnets' => [String]
+      }
+
+      CREATE_CACHE_SUBNET_GROUP = BASIC.merge({
+         'CreateCacheSubnetGroupResult' => {
+           'CacheSubnetGroup' => CACHE_SUBNET_GROUP
+         }
+       })
+
+      DESCRIBE_CACHE_SUBNET_GROUPS = BASIC.merge({
+        'DescribeCacheSubnetGroupsResult' => {
+          'CacheSubnetGroups' => [CACHE_SUBNET_GROUP]
+        }
+      })
+
       # Cache Parameter Groups
       PARAMETER_GROUP = {
         'CacheParameterGroupFamily' => String,

data/tests/aws/requests/elasticache/subnet_group_tests.rb

@@ -0,0 +1,52 @@
+Shindo.tests('AWS::Elasticache | subnet group requests', ['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..4).map do
+    subnet = Fog::Compute[:aws].create_subnet(@vpc.id, "10.#{vpc_range}.#{subnet_range}.0/24",
+      'AvailabilityZone' => subnet_az).body['subnet']
+    subnet_az = subnet_az.succ
+    subnet_range *= 2
+    subnet
+  end
+
+  tests('success') do
+
+    subnet_ids = @subnets.map { |sn| sn['subnetId'] }.to_a
+
+    tests("#create_cache_subnet_group").formats(AWS::Elasticache::Formats::CREATE_CACHE_SUBNET_GROUP) do
+      result = Fog::AWS[:elasticache].create_cache_subnet_group(@subnet_group_name, subnet_ids, 'A subnet group').body
+
+      returns(@subnet_group_name) { result['CreateCacheSubnetGroupResult']['CacheSubnetGroup']['CacheSubnetGroupName'] }
+      returns('A subnet group') { result['CreateCacheSubnetGroupResult']['CacheSubnetGroup']['CacheSubnetGroupDescription'] }
+      returns(@vpc.id) { result['CreateCacheSubnetGroupResult']['CacheSubnetGroup']['VpcId'] }
+      returns(subnet_ids.sort) { result['CreateCacheSubnetGroupResult']['CacheSubnetGroup']['Subnets'].sort }
+
+      result
+    end
+
+    tests("#describe_cache_subnet_groups").formats(AWS::Elasticache::Formats::DESCRIBE_CACHE_SUBNET_GROUPS) do
+      Fog::AWS[:elasticache].describe_cache_subnet_groups.body
+    end
+
+    tests("#delete_cache_subnet_group").formats(AWS::Elasticache::Formats::BASIC) do
+      Fog::AWS[:elasticache].delete_cache_subnet_group(@subnet_group_name).body
+    end
+
+  end
+
+  @subnets.each do |sn|
+    Fog::Compute[:aws].delete_subnet(sn['subnetId'])
+  end
+  @vpc.destroy
+
+end

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

@@ -120,6 +120,9 @@ Shindo.tests('AWS::IAM | server certificate requests', ['aws']) do
   end
 
   tests('#delete_server_certificate').formats(AWS::IAM::Formats::BASIC) do
+    tests('raises NotFound').raises(Fog::AWS::IAM::NotFound) do
+      Fog::AWS::IAM.new.delete_server_certificate("#{@key_name}fake")
+    end
     Fog::AWS::IAM.new.delete_server_certificate(@key_name).body
   end
 

data/tests/aws/requests/rds/subnet_groups_tests.rb

@@ -13,7 +13,7 @@ Shindo.tests('AWS::RDS | subnet group requests', ['aws', 'rds']) do
   subnet_range = 8
   @subnets = (1..4).map do
     subnet = Fog::Compute[:aws].create_subnet(@vpc.id, "10.#{vpc_range}.#{subnet_range}.0/24",
-      'AvailabilityZone' => subnet_az).body['subnetSet'].first
+      'AvailabilityZone' => subnet_az).body['subnet']
     subnet_az = subnet_az.succ
     subnet_range *= 2
     subnet

data/tests/aws/requests/storage/multipart_upload_tests.rb

@@ -11,7 +11,6 @@ Shindo.tests('Fog::Storage[:aws] | multipart upload requests', ["aws"]) do
     }
 
     tests("#initiate_multipart_upload('#{@directory.identity}')", 'fog_multipart_upload').formats(@initiate_multipart_upload_format) do
-      pending if Fog.mocking?
       data = Fog::Storage[:aws].initiate_multipart_upload(@directory.identity, 'fog_multipart_upload').body
       @upload_id = data['UploadId']
       data
@@ -49,7 +48,6 @@ Shindo.tests('Fog::Storage[:aws] | multipart upload requests', ["aws"]) do
     @parts = []
 
     tests("#upload_part('#{@directory.identity}', 'fog_multipart_upload', '#{@upload_id}', 1, ('x' * 6 * 1024 * 1024))").succeeds do
-      pending if Fog.mocking?
       data = Fog::Storage[:aws].upload_part(@directory.identity, 'fog_multipart_upload', @upload_id, 1, ('x' * 6 * 1024 * 1024))
       @parts << data.headers['ETag']
     end
@@ -80,9 +78,7 @@ Shindo.tests('Fog::Storage[:aws] | multipart upload requests', ["aws"]) do
       Fog::Storage[:aws].list_parts(@directory.identity, 'fog_multipart_upload', @upload_id).body
     end
 
-    if !Fog.mocking?
-      @parts << Fog::Storage[:aws].upload_part(@directory.identity, 'fog_multipart_upload', @upload_id, 2, ('x' * 4 * 1024 * 1024)).headers['ETag']
-    end
+    @parts << Fog::Storage[:aws].upload_part(@directory.identity, 'fog_multipart_upload', @upload_id, 2, ('x' * 4 * 1024 * 1024)).headers['ETag']
 
     @complete_multipart_upload_format = {
       'Bucket'    => String,
@@ -92,25 +88,18 @@ Shindo.tests('Fog::Storage[:aws] | multipart upload requests', ["aws"]) do
     }
 
     tests("#complete_multipart_upload('#{@directory.identity}', 'fog_multipart_upload', '#{@upload_id}', #{@parts.inspect})").formats(@complete_multipart_upload_format) do
-      pending if Fog.mocking?
       Fog::Storage[:aws].complete_multipart_upload(@directory.identity, 'fog_multipart_upload', @upload_id, @parts).body
     end
 
     tests("#get_object('#{@directory.identity}', 'fog_multipart_upload').body").succeeds do
-      pending if Fog.mocking?
       Fog::Storage[:aws].get_object(@directory.identity, 'fog_multipart_upload').body == ('x' * 10 * 1024 * 1024)
     end
 
-    if !Fog.mocking?
-      @directory.files.new(:key => 'fog_multipart_upload').destroy
-    end
+    @directory.files.new(:key => 'fog_multipart_upload').destroy
 
-    if !Fog.mocking?
-      @upload_id = Fog::Storage[:aws].initiate_multipart_upload(@directory.identity, 'fog_multipart_abort').body['UploadId']
-    end
+    @upload_id = Fog::Storage[:aws].initiate_multipart_upload(@directory.identity, 'fog_multipart_abort').body['UploadId']
 
     tests("#abort_multipart_upload('#{@directory.identity}', 'fog_multipart_abort', '#{@upload_id}')").succeeds do
-      pending if Fog.mocking?
       Fog::Storage[:aws].abort_multipart_upload(@directory.identity, 'fog_multipart_abort', @upload_id)
     end
 

data/tests/brightbox/compute/schema.rb

@@ -99,6 +99,43 @@ class Brightbox
           "reverse_dns"     => String
         }
 
+        DATABASE_SERVER = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "allow_access"    => Array,
+          "database_version" => String,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String
+        }
+
+        DATABASE_SNAPSHOT = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "database_version" => String,
+          "size"            => Integer,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT
+        }
+
+        DATABASE_SERVER_TYPE = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "ram"             => Integer,
+          "disk_size"       => Integer
+        }
+
         FIREWALL_POLICY = {
           "id"              => String,
           "resource_type"   => String,
@@ -290,6 +327,43 @@ class Brightbox
           "server_group"     => Fog::Brightbox::Nullable::ServerGroup
         }
 
+        DATABASE_SERVER = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "allow_access"    => Array,
+          "database_version" => String,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String
+        }
+
+        DATABASE_SNAPSHOT = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "database_version" => String,
+          "size"            => Integer,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT
+        }
+
+        DATABASE_SERVER_TYPE = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "ram"             => Integer,
+          "disk_size"       => Integer
+        }
+
         FIREWALL_POLICY = {
           "id"              => String,
           "resource_type"   => String,
@@ -498,6 +572,45 @@ class Brightbox
           "server_group"    => Fog::Brightbox::Nullable::ServerGroup
         }
 
+        DATABASE_SERVER = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "admin_username"  => Fog::Nullable::String,
+          "admin_password"  => Fog::Nullable::String,
+          "allow_access"    => Array,
+          "database_version" => String,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String
+        }
+
+        DATABASE_SNAPSHOT = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "database_version" => String,
+          "size"            => Integer,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT
+        }
+
+        DATABASE_SERVER_TYPE = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "ram"             => Integer,
+          "disk_size"       => Integer
+        }
+
         FIREWALL_POLICY = {
           "id"              => String,
           "resource_type"   => String,
@@ -669,15 +782,18 @@ class Brightbox
         API_CLIENTS = [Brightbox::Compute::Formats::Collected::API_CLIENT]
         APPLICATION = [Brightbox::Compute::Formats::Collected::APPLICATION]
         CLOUD_IPS = [Brightbox::Compute::Formats::Collected::CLOUD_IP]
-        IMAGES = [Brightbox::Compute::Formats::Collected::IMAGE]
+        COLLABORATIONS = [Brightbox::Compute::Formats::Collected::COLLABORATION]
+        DATABASE_SERVERS = [Brightbox::Compute::Formats::Collected::DATABASE_SERVER]
+        DATABASE_SERVER_TYPES = [Brightbox::Compute::Formats::Collected::DATABASE_SERVER_TYPE]
+        DATABASE_SNAPSHOTS = [Brightbox::Compute::Formats::Collected::DATABASE_SNAPSHOT]
         FIREWALL_POLICIES = [Brightbox::Compute::Formats::Collected::FIREWALL_POLICY]
+        IMAGES = [Brightbox::Compute::Formats::Collected::IMAGE]
         LOAD_BALANCERS = [Brightbox::Compute::Formats::Collected::LOAD_BALANCER]
         SERVERS = [Brightbox::Compute::Formats::Collected::SERVER]
         SERVER_GROUPS = [Brightbox::Compute::Formats::Collected::SERVER_GROUP]
         SERVER_TYPES = [Brightbox::Compute::Formats::Collected::SERVER_TYPE]
         USERS = [Brightbox::Compute::Formats::Collected::USER]
         ZONES = [Brightbox::Compute::Formats::Collected::ZONE]
-        COLLABORATIONS = [Brightbox::Compute::Formats::Collected::COLLABORATION]
       end
     end
   end