fog-maestrodev 1.15.0.20130829165835 → 1.15.0.20130927082724

data/tests/brightbox/requests/compute/account_tests.rb

@@ -5,21 +5,21 @@ Shindo.tests('Fog::Compute[:brightbox] | account requests', ['brightbox']) do
     tests("#list_accounts") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_accounts
-      formats(Brightbox::Compute::Formats::Collection::ACCOUNTS, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::ACCOUNTS, {:allow_extra_keys => true}) { result }
     end
 
     tests("#get_scoped_account") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_scoped_account
       @scoped_account_identifier = result["id"]
-      formats(Brightbox::Compute::Formats::Full::ACCOUNT, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::ACCOUNT, {:allow_extra_keys => true}) { result }
       test("ftp password is blanked") { result["library_ftp_password"].nil?  }
     end
 
     tests("#get_account(#{@scoped_account_identifier}") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_account(@scoped_account_identifier)
-      formats(Brightbox::Compute::Formats::Full::ACCOUNT, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::ACCOUNT, {:allow_extra_keys => true}) { result }
       test("ftp password is blanked") { result["library_ftp_password"].nil?  }
     end
 
@@ -27,26 +27,26 @@ Shindo.tests('Fog::Compute[:brightbox] | account requests', ['brightbox']) do
     tests("#update_scoped_account(#{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_scoped_account(update_options)
-      formats(Brightbox::Compute::Formats::Full::ACCOUNT, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::ACCOUNT, {:allow_extra_keys => true}) { result }
     end
 
     tests("#update_account(#{@scoped_account_identifier}, #{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_account(@scoped_account_identifier, update_options)
-      formats(Brightbox::Compute::Formats::Full::ACCOUNT, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::ACCOUNT, {:allow_extra_keys => true}) { result }
     end
 
     tests("#reset_ftp_password_scoped_account") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].reset_ftp_password_scoped_account
-      formats(Brightbox::Compute::Formats::Full::ACCOUNT, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::ACCOUNT, {:allow_extra_keys => true}) { result }
       test("new ftp password is visible") { ! result["library_ftp_password"].nil?  }
     end
 
     tests("#reset_ftp_password_account(#{@scoped_account_identifier})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].reset_ftp_password_account(@scoped_account_identifier)
-      formats(Brightbox::Compute::Formats::Full::ACCOUNT, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::ACCOUNT, {:allow_extra_keys => true}) { result }
       test("new ftp password is visible") { ! result["library_ftp_password"].nil?  }
     end
 

data/tests/brightbox/requests/compute/api_client_tests.rb

@@ -11,39 +11,39 @@ Shindo.tests('Fog::Compute[:brightbox] | api client requests', ['brightbox']) do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].create_api_client(create_options)
       @api_client_id = result["id"]
-      formats(Brightbox::Compute::Formats::Full::API_CLIENT, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, {:allow_extra_keys => true}) { result }
     end
 
     tests("#list_api_clients") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_api_clients
-      formats(Brightbox::Compute::Formats::Collection::API_CLIENTS, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::API_CLIENTS, {:allow_extra_keys => true}) { result }
     end
 
     tests("#get_api_client('#{@api_client_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_api_client(@api_client_id)
-      formats(Brightbox::Compute::Formats::Full::API_CLIENT, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, {:allow_extra_keys => true}) { result }
     end
 
     update_options = {:name => "Fog@#{Time.now.iso8601}"}
     tests("#update_api_client('#{@api_client_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_api_client(@api_client_id, update_options)
-      formats(Brightbox::Compute::Formats::Full::API_CLIENT, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, {:allow_extra_keys => true}) { result }
     end
 
     tests("#reset_secret_api_client('#{@api_client_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].reset_secret_api_client(@api_client_id)
-      formats(Brightbox::Compute::Formats::Full::API_CLIENT, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, {:allow_extra_keys => true}) { result }
       test("new secret is visible") { ! result["secret"].nil?  }
     end
 
     tests("#destroy_api_client('#{@api_client_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].destroy_api_client(@api_client_id)
-      formats(Brightbox::Compute::Formats::Full::API_CLIENT, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, {:allow_extra_keys => true}) { result }
     end
 
   end

data/tests/brightbox/requests/compute/application_test.rb

@@ -10,39 +10,39 @@ Shindo.tests('Fog::Compute[:brightbox] | api client requests', ['brightbox']) do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].create_application(create_options)
       @application_id = result["id"]
-      formats(Brightbox::Compute::Formats::Full::APPLICATION, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::APPLICATION, {:allow_extra_keys => true}) { result }
     end
 
     tests("#list_applications") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_applications
-      formats(Brightbox::Compute::Formats::Collection::APPLICATION, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::APPLICATION, {:allow_extra_keys => true}) { result }
     end
 
     tests("#get_application('#{@application_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_application(@application_id)
-      formats(Brightbox::Compute::Formats::Full::APPLICATION, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::APPLICATION, {:allow_extra_keys => true}) { result }
     end
 
     update_options = {:name => "Fog@#{Time.now.iso8601}"}
     tests("#update_application('#{@application_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_application(@application_id, update_options)
-      formats(Brightbox::Compute::Formats::Full::APPLICATION, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::APPLICATION, {:allow_extra_keys => true}) { result }
     end
 
     tests("#reset_secret_application('#{@application_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].reset_secret_application(@application_id)
-      formats(Brightbox::Compute::Formats::Full::APPLICATION, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::APPLICATION, {:allow_extra_keys => true}) { result }
       test("new secret is visible") { ! result["secret"].nil?  }
     end
 
     tests("#destroy_application('#{@application_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].destroy_application(@application_id)
-      formats(Brightbox::Compute::Formats::Full::APPLICATION, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::APPLICATION, {:allow_extra_keys => true}) { result }
     end
 
   end

data/tests/brightbox/requests/compute/cloud_ip_tests.rb

@@ -10,19 +10,19 @@ Shindo.tests('Fog::Compute[:brightbox] | cloud ip requests', ['brightbox']) do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].create_cloud_ip
       @cloud_ip_id = result["id"]
-      formats(Brightbox::Compute::Formats::Full::CLOUD_IP, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::CLOUD_IP, {:allow_extra_keys => true}) { result }
     end
 
     tests("#list_cloud_ips") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_cloud_ips
-      formats(Brightbox::Compute::Formats::Collection::CLOUD_IPS, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::CLOUD_IPS, {:allow_extra_keys => true}) { result }
     end
 
     tests("#get_cloud_ip('#{@cloud_ip_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_cloud_ip(@cloud_ip_id)
-      formats(Brightbox::Compute::Formats::Full::CLOUD_IP, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::CLOUD_IP, {:allow_extra_keys => true}) { result }
     end
 
     unless Fog.mocking?
@@ -32,7 +32,7 @@ Shindo.tests('Fog::Compute[:brightbox] | cloud ip requests', ['brightbox']) do
     tests("#map_cloud_ip('#{@cloud_ip_id}', #{map_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].map_cloud_ip(@cloud_ip_id, map_options)
-      formats(Brightbox::Compute::Formats::Full::CLOUD_IP, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::CLOUD_IP, {:allow_extra_keys => true}) { result }
     end
 
     unless Fog.mocking?
@@ -42,7 +42,7 @@ Shindo.tests('Fog::Compute[:brightbox] | cloud ip requests', ['brightbox']) do
     tests("#unmap_cloud_ip('#{@cloud_ip_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].unmap_cloud_ip(@cloud_ip_id)
-      formats(Brightbox::Compute::Formats::Full::CLOUD_IP, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::CLOUD_IP, {:allow_extra_keys => true}) { result }
     end
 
     unless Fog.mocking?
@@ -52,14 +52,14 @@ Shindo.tests('Fog::Compute[:brightbox] | cloud ip requests', ['brightbox']) do
     tests("#update_cloud_ip('#{@cloud_ip_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_cloud_ip(@cloud_ip_id, update_options)
-      formats(Brightbox::Compute::Formats::Full::CLOUD_IP, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::CLOUD_IP, {:allow_extra_keys => true}) { result }
       result = Fog::Compute[:brightbox].update_cloud_ip(@cloud_ip_id, {:reverse_dns => ""})
     end
 
     tests("#destroy_cloud_ip('#{@cloud_ip_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].destroy_cloud_ip(@cloud_ip_id)
-      formats(Brightbox::Compute::Formats::Full::CLOUD_IP, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::CLOUD_IP, {:allow_extra_keys => true}) { result }
     end
 
     unless Fog.mocking?

data/tests/brightbox/requests/compute/firewall_policy_tests.rb

@@ -10,17 +10,17 @@ Shindo.tests('Fog::Compute[:brightbox] | firewall policy requests', ['brightbox'
     tests("#create_firewall_policy(#{create_options.inspect})") do
       result = Fog::Compute[:brightbox].create_firewall_policy(create_options)
       @firewall_policy_id = result["id"]
-      formats(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, {:allow_extra_keys => true}) { result }
     end
 
     tests("#list_firewall_policies()") do
-      formats(Brightbox::Compute::Formats::Collection::FIREWALL_POLICIES, false) do
+      data_matches_schema(Brightbox::Compute::Formats::Collection::FIREWALL_POLICIES, {:allow_extra_keys => true}) do
         Fog::Compute[:brightbox].list_firewall_policies
       end
     end
 
     tests("#get_firewall_policy('#{@firewall_policy_id}')") do
-      formats(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, false) do
+      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, {:allow_extra_keys => true}) do
         Fog::Compute[:brightbox].get_firewall_policy(@firewall_policy_id)
       end
     end
@@ -28,13 +28,13 @@ Shindo.tests('Fog::Compute[:brightbox] | firewall policy requests', ['brightbox'
     update_options = {:name => "Fog test policy B"}
     tests("#update_firewall_policy('#{@firewall_policy_id}', #{update_options.inspect})") do
       result = Fog::Compute[:brightbox].update_firewall_policy(@firewall_policy_id, update_options)
-      formats(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, {:allow_extra_keys => true}) { result }
       returns("Fog test policy B") { result["name"] }
     end
 
     tests("#destroy_firewall_policy('#{@firewall_policy_id}')") do
       result = Fog::Compute[:brightbox].destroy_firewall_policy(@firewall_policy_id)
-      formats(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, {:allow_extra_keys => true}) { result }
     end
   end
 end

data/tests/brightbox/requests/compute/firewall_rule_tests.rb

@@ -15,25 +15,25 @@ Shindo.tests('Fog::Compute[:brightbox] | firewall rule requests', ['brightbox'])
     tests("#create_firewall_rule(#{create_options.inspect})") do
       result = Fog::Compute[:brightbox].create_firewall_rule(create_options)
       @firewall_rule_id = result["id"]
-      formats(Brightbox::Compute::Formats::Full::FIREWALL_RULE, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_RULE, {:allow_extra_keys => true}) { result }
     end
 
     tests("#get_firewall_rule('#{@firewall_rule_id}')") do
-      formats(Brightbox::Compute::Formats::Full::FIREWALL_RULE, false) do
+      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_RULE, {:allow_extra_keys => true}) do
         Fog::Compute[:brightbox].get_firewall_rule(@firewall_rule_id)
       end
     end
 
     update_options = {:source => nil, :destination => "127.0.0.1"}
     tests("#update_firewall_rule('#{@firewall_rule_id}', #{update_options.inspect})") do
-      formats(Brightbox::Compute::Formats::Full::FIREWALL_RULE, false) do
+      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_RULE, {:allow_extra_keys => true}) do
         Fog::Compute[:brightbox].update_firewall_rule(@firewall_rule_id, update_options)
       end
     end
 
     tests("#destroy_firewall_rule('#{@firewall_rule_id}')") do
       result = Fog::Compute[:brightbox].destroy_firewall_rule(@firewall_rule_id)
-      formats(Brightbox::Compute::Formats::Full::FIREWALL_RULE, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_RULE, {:allow_extra_keys => true}) { result }
     end
 
     unless Fog.mocking?

data/tests/brightbox/requests/compute/helper.rb

@@ -1,46 +1,3 @@
-module Fog
-  module Brightbox
-    module Nullable
-      module Account; end
-      module FirewallPolicy; end
-      module Image; end
-      module Interface; end
-      module LoadBalancer; end
-      module Server; end
-      module ServerGroup; end
-      module User; end
-      module Zone; end
-    end
-  end
-end
-
-Hash.send :include, Fog::Brightbox::Nullable::Account
-NilClass.send :include, Fog::Brightbox::Nullable::Account
-
-Hash.send :include, Fog::Brightbox::Nullable::FirewallPolicy
-NilClass.send :include, Fog::Brightbox::Nullable::FirewallPolicy
-
-Hash.send :include, Fog::Brightbox::Nullable::Image
-NilClass.send :include, Fog::Brightbox::Nullable::Image
-
-Hash.send :include, Fog::Brightbox::Nullable::Interface
-NilClass.send :include, Fog::Brightbox::Nullable::Interface
-
-Hash.send :include, Fog::Brightbox::Nullable::LoadBalancer
-NilClass.send :include, Fog::Brightbox::Nullable::LoadBalancer
-
-Hash.send :include, Fog::Brightbox::Nullable::Server
-NilClass.send :include, Fog::Brightbox::Nullable::Server
-
-Hash.send :include, Fog::Brightbox::Nullable::ServerGroup
-NilClass.send :include, Fog::Brightbox::Nullable::ServerGroup
-
-Hash.send :include, Fog::Brightbox::Nullable::User
-NilClass.send :include, Fog::Brightbox::Nullable::User
-
-Hash.send :include, Fog::Brightbox::Nullable::Zone
-NilClass.send :include, Fog::Brightbox::Nullable::Zone
-
 class Brightbox
   module Compute
     module TestSupport
@@ -80,650 +37,5 @@ class Brightbox
         images.select { |img| img["official"] && img["virtual_size"] != 0 }.sort_by { |img| img["disk_size"] }.first || images.first
       end
     end
-
-    module Formats
-      module Struct
-        CIP_PORT_TRANSLATOR = {
-          "protocol" => String,
-          "incoming" => Integer,
-          "outgoing" => Integer
-        }
-        LB_LISTENER = {
-          "in"              => Integer,
-          "out"             => Integer,
-          "protocol"        => String,
-          "timeout"         => Integer
-        }
-        LB_HEALTHCHECK = {
-          "type"            => String,
-          "request"         => String,
-          "port"            => Integer,
-          "interval"        => Integer,
-          "timeout"         => Integer,
-          "threshold_up"    => Integer,
-          "threshold_down"  => Integer
-        }
-      end
-
-      module Nested
-        ACCOUNT = {
-          "name"            => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "id"              => String,
-          "status"          => String
-        }
-
-        API_CLIENT = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => String,
-          "description"     => String,
-          "revoked_at"      => Fog::Nullable::String
-        }
-
-        CLOUD_IP = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => Fog::Nullable::String,
-          "public_ip"       => String,
-          "status"          => String,
-          "reverse_dns"     => String
-        }
-
-        FIREWALL_POLICY = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => Fog::Nullable::String,
-          "default"         => Fog::Boolean,
-          "created_at"      => String,
-          "description"     => Fog::Nullable::String
-        }
-
-        FIREWALL_RULE = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "created_at"      => String,
-          "source"          => Fog::Nullable::String,
-          "source_port"     => Fog::Nullable::String,
-          "destination"     => Fog::Nullable::String,
-          "destination_port" => Fog::Nullable::String,
-          "protocol"        => Fog::Nullable::String,
-          "icmp_type_name"  => Fog::Nullable::String,
-          "description"     => Fog::Nullable::String
-        }
-
-        IMAGE = {
-          "name"            => String,
-          "created_at"      => String,
-          "resource_type"   => String,
-          "arch"            => String,
-          "url"             => String,
-          "id"              => String,
-          "description"     => String,
-          "source"          => String,
-          "status"          => String,
-          "owner"           => String,
-          "username"        => Fog::Nullable::String
-        }
-
-        INTERFACE = {
-          "resource_type"   => String,
-          "url"             => String,
-          "id"              => String,
-          "ipv4_address"    => String,
-          "ipv6_address"    => Fog::Nullable::String,
-          "mac_address"     => String
-        }
-
-        LOAD_BALANCER = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => String,
-          "status"          => String,
-          "created_at"      => String,
-          "deleted_at"      => Fog::Nullable::String
-        }
-
-        SERVER = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => String,
-          "status"          => String,
-          "hostname"        => String,
-          "fqdn"            => String,
-          "created_at"      => String,
-          "started_at"      => Fog::Nullable::String,
-          "deleted_at"      => Fog::Nullable::String,
-          "username"        => Fog::Nullable::String
-        }
-
-        SERVER_GROUP = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => Fog::Nullable::String,
-          "created_at"      => String,
-          "default"         => Fog::Boolean,
-          "description"     => Fog::Nullable::String,
-          "created_at"      => String
-        }
-
-        SERVER_TYPE = {
-          "name"            => String,
-          "handle"          => Fog::Nullable::String,
-          "cores"           => Integer,
-          "resource_type"   => String,
-          "disk_size"       => Integer,
-          "url"             => String,
-          "id"              => String,
-          "ram"             => Integer,
-          "status"          => String
-        }
-
-        USER = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => String,
-          "email_address"   => String
-        }
-
-
-        COLLABORATION = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "status"          => String,
-          "email"           => Fog::Nullable::String,
-          "role"            => String,
-          "role_label"      => String,
-          "user"            => Fog::Brightbox::Nullable::User,
-          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
-          "inviter"         => Brightbox::Compute::Formats::Nested::USER
-        }
-
-        ZONE = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "handle"          => Fog::Nullable::String
-        }
-      end
-
-      module Collected
-        ACCOUNT = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => String,
-          "status"          => String,
-          "vat_registration_number" => Fog::Nullable::String,
-          "telephone_number" => Fog::Nullable::String,
-          "telephone_verified" => Fog::Nullable::Boolean,
-          "ram_limit"       => Integer,
-          "ram_used"        => Integer,
-          "cloud_ips_limit" => Integer,
-          "cloud_ips_used"  => Integer,
-          "load_balancers_limit" => Integer,
-          "load_balancers_used" => Integer,
-          "library_ftp_password" => Fog::Nullable::String,
-          "verified_telephone" => Fog::Nullable::String,
-          "verified_at"     => Fog::Nullable::String,
-          "verified_ip"     => Fog::Nullable::String,
-          "owner"           => Brightbox::Compute::Formats::Nested::USER,
-          "users"           => [Brightbox::Compute::Formats::Nested::USER],
-          "clients"         => [Brightbox::Compute::Formats::Nested::API_CLIENT],
-          "servers"         => [Brightbox::Compute::Formats::Nested::SERVER],
-          "load_balancers"  => [Brightbox::Compute::Formats::Nested::LOAD_BALANCER],
-          "cloud_ips"       => [Brightbox::Compute::Formats::Nested::CLOUD_IP],
-          "server_groups"   => [Brightbox::Compute::Formats::Nested::SERVER_GROUP],
-          "firewall_policies" => [Brightbox::Compute::Formats::Nested::FIREWALL_POLICY],
-          "images"          => [Brightbox::Compute::Formats::Nested::IMAGE],
-          "zones"           => [Brightbox::Compute::Formats::Nested::ZONE]
-        }
-
-        API_CLIENT = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => String,
-          "description"     => String,
-          "revoked_at"      => Fog::Nullable::String,
-          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT
-        }
-
-        APPLICATION = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => Fog::Nullable::String
-        }
-
-        CLOUD_IP = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => Fog::Nullable::String,
-          "public_ip"       => String,
-          "status"          => String,
-          "reverse_dns"     => String,
-          "port_translators" => [Brightbox::Compute::Formats::Struct::CIP_PORT_TRANSLATOR],
-          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
-          "interface"       => Fog::Brightbox::Nullable::Interface,
-          "load_balancer"   => Fog::Brightbox::Nullable::LoadBalancer,
-          "server"          => Fog::Brightbox::Nullable::Server,
-          "server_group"     => Fog::Brightbox::Nullable::ServerGroup
-        }
-
-        FIREWALL_POLICY = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => Fog::Nullable::String,
-          "description"     => Fog::Nullable::String,
-          "default"         => Fog::Boolean,
-          "created_at"      => String,
-          "server_group"    => Fog::Brightbox::Nullable::ServerGroup,
-          "rules"           => [Brightbox::Compute::Formats::Nested::FIREWALL_RULE]
-        }
-
-        IMAGE = {
-          "name"            => String,
-          "created_at"      => String,
-          "resource_type"   => String,
-          "arch"            => String,
-          "url"             => String,
-          "id"              => String,
-          "description"     => String,
-          "source"          => String,
-          "source_type"     => String,
-          "status"          => String,
-          "owner"           => String,
-          "username"        => Fog::Nullable::String,
-          "public"          => Fog::Boolean,
-          "official"        => Fog::Boolean,
-          "compatibility_mode" => Fog::Boolean,
-          "virtual_size"    => Integer,
-          "disk_size"       => Integer,
-          "min_ram"         => Fog::Nullable::Integer,
-          "ancestor"        => Fog::Brightbox::Nullable::Image,
-          "username"        => Fog::Nullable::String
-        }
-
-        LOAD_BALANCER = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => String,
-          "status"          => String,
-          "created_at"      => String,
-          "deleted_at"      => Fog::Nullable::String,
-          "cloud_ips"       => [Brightbox::Compute::Formats::Nested::CLOUD_IP],
-          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
-          "listeners"       => [Brightbox::Compute::Formats::Struct::LB_LISTENER],
-          "nodes"           => [Brightbox::Compute::Formats::Nested::SERVER]
-        }
-
-        SERVER = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => String,
-          "status"          => String,
-          "hostname"        => String,
-          "fqdn"            => String,
-          "created_at"      => String,
-          "started_at"      => Fog::Nullable::String,
-          "deleted_at"      => Fog::Nullable::String,
-          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
-          "server_type"     => Brightbox::Compute::Formats::Nested::SERVER_TYPE,
-          "cloud_ips"       => [Brightbox::Compute::Formats::Nested::CLOUD_IP],
-          "image"           => Brightbox::Compute::Formats::Nested::IMAGE,
-          "server_groups"   => [Brightbox::Compute::Formats::Nested::SERVER_GROUP],
-          "snapshots"       => [Brightbox::Compute::Formats::Nested::IMAGE],
-          "interfaces"      => [Brightbox::Compute::Formats::Nested::INTERFACE],
-          "zone"            => Fog::Brightbox::Nullable::Zone,
-          "username"        => Fog::Nullable::String,
-          "compatibility_mode" => Fog::Boolean
-        }
-
-        SERVER_GROUP = {
-          "created_at"      => String,
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => Fog::Nullable::String,
-          "description"     => Fog::Nullable::String,
-          "default"         => Fog::Boolean,
-          "created_at"      => String,
-          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
-          "servers"         => [Brightbox::Compute::Formats::Nested::SERVER],
-          "firewall_policy" => Fog::Brightbox::Nullable::FirewallPolicy
-        }
-
-        SERVER_TYPE = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "handle"          => Fog::Nullable::String,
-          "name"            => String,
-          "status"          => String,
-          "cores"           => Integer,
-          "ram"             => Integer,
-          "disk_size"       => Integer
-        }
-
-        USER = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => String,
-          "email_address"   => String,
-          "email_verified"  => Fog::Boolean,
-          "accounts"        => [Brightbox::Compute::Formats::Nested::ACCOUNT],
-          "default_account" => NilClass
-        }
-
-        COLLABORATION = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "status"          => String,
-          "role"            => String,
-          "role_label"      => String,
-          "email"           => Fog::Nullable::String,
-          "user"            => Fog::Brightbox::Nullable::User,
-          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
-          "inviter"         => Brightbox::Compute::Formats::Nested::USER
-        }
-
-        ZONE = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "handle"          => Fog::Nullable::String
-        }
-      end
-
-      module Full
-        ACCOUNT = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => String,
-          "status"          => String,
-          "address_1"       => String,
-          "address_2"       => String,
-          "city"            => String,
-          "county"          => String,
-          "postcode"        => String,
-          "country_code"    => String,
-          "country_name"    => String,
-          "vat_registration_number" => Fog::Nullable::String,
-          "telephone_number" => String,
-          "telephone_verified" => Fog::Boolean,
-          "created_at"      => String,
-          "ram_limit"       => Integer,
-          "ram_used"        => Integer,
-          "cloud_ips_limit" => Integer,
-          "cloud_ips_used"  => Integer,
-          "load_balancers_limit" => Integer,
-          "load_balancers_used" => Integer,
-          "library_ftp_host" => String,
-          "library_ftp_user" => String,
-          "library_ftp_password" => Fog::Nullable::String,
-          "verified_telephone" => Fog::Nullable::String,
-          "verified_at"     => Fog::Nullable::String,
-          "verified_ip"     => Fog::Nullable::String,
-          "valid_credit_card" => Fog::Boolean,
-          "owner"           => Brightbox::Compute::Formats::Nested::USER,
-          "users"           => [Brightbox::Compute::Formats::Nested::USER],
-          "clients"         => [Brightbox::Compute::Formats::Nested::API_CLIENT],
-          "servers"         => [Brightbox::Compute::Formats::Nested::SERVER],
-          "load_balancers"  => [Brightbox::Compute::Formats::Nested::LOAD_BALANCER],
-          "cloud_ips"       => [Brightbox::Compute::Formats::Nested::CLOUD_IP],
-          "server_groups"   => [Brightbox::Compute::Formats::Nested::SERVER_GROUP],
-          "firewall_policies" => [Brightbox::Compute::Formats::Nested::FIREWALL_POLICY],
-          "images"          => [Brightbox::Compute::Formats::Nested::IMAGE],
-          "zones"           => [Brightbox::Compute::Formats::Nested::ZONE]
-        }
-
-        API_CLIENT = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => String,
-          "description"     => String,
-          "revoked_at"      => Fog::Nullable::String,
-          "secret"          => Fog::Nullable::String,
-          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT
-        }
-
-        APPLICATION = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => Fog::Nullable::String,
-          "secret"          => Fog::Nullable::String
-        }
-
-        CLOUD_IP = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => Fog::Nullable::String,
-          "public_ip"       => String,
-          "status"          => String,
-          "reverse_dns"     => String,
-          "port_translators" => [Brightbox::Compute::Formats::Struct::CIP_PORT_TRANSLATOR],
-          "account"         => Fog::Brightbox::Nullable::Account,
-          "interface"       => Fog::Brightbox::Nullable::Interface,
-          "load_balancer"   => Fog::Brightbox::Nullable::LoadBalancer,
-          "server"          => Fog::Brightbox::Nullable::Server,
-          "server_group"    => Fog::Brightbox::Nullable::ServerGroup
-        }
-
-        FIREWALL_POLICY = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => Fog::Nullable::String,
-          "description"     => Fog::Nullable::String,
-          "default"         => Fog::Boolean,
-          "created_at"      => String,
-          "server_group"    => Fog::Brightbox::Nullable::ServerGroup,
-          "rules"           => [Brightbox::Compute::Formats::Nested::FIREWALL_RULE]
-        }
-
-        FIREWALL_RULE = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "created_at"      => String,
-          "source"          => Fog::Nullable::String,
-          "source_port"     => Fog::Nullable::String,
-          "destination"     => Fog::Nullable::String,
-          "destination_port" => Fog::Nullable::String,
-          "protocol"        => Fog::Nullable::String,
-          "icmp_type_name"  => Fog::Nullable::String,
-          "description"     => Fog::Nullable::String,
-          "firewall_policy" => Brightbox::Compute::Formats::Nested::FIREWALL_POLICY
-        }
-
-        #FIREWALL_RULE = {
-          #"id"              => String,
-          #"resource_type"   => String,
-          #"url"             => String,
-          #"source"          => String,
-          #"source_port"     => String,
-          #"destination"     => String,
-          #"destination_port" => String,
-          #"protocol"        => String,
-          #"icmp_type_name"  => String,
-          #"description"     => Fog::Nullable::String
-        #}
-
-        IMAGE = {
-          "name"            => String,
-          "created_at"      => String,
-          "resource_type"   => String,
-          "arch"            => String,
-          "url"             => String,
-          "id"              => String,
-          "description"     => String,
-          "source"          => String,
-          "source_type"     => String,
-          "status"          => String,
-          "owner"           => String, # Account ID not object
-          "username"        => Fog::Nullable::String,
-          "public"          => Fog::Boolean,
-          "official"        => Fog::Boolean,
-          "compatibility_mode"   => Fog::Boolean,
-          "virtual_size"    => Integer,
-          "disk_size"       => Integer,
-          "min_ram"         => Fog::Nullable::Integer,
-          "ancestor"        => Fog::Brightbox::Nullable::Image,
-          "username"        => Fog::Nullable::String,
-          "licence_name"    => Fog::Nullable::String
-        }
-
-        INTERFACE = {
-          "resource_type"   => String,
-          "url"             => String,
-          "id"              => String,
-          "ipv4_address"    => String,
-          "ipv6_address"    => Fog::Nullable::String,
-          "mac_address"     => String,
-          "server"          => Brightbox::Compute::Formats::Nested::SERVER
-        }
-
-        LOAD_BALANCER = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => String,
-          "status"          => String,
-          "listeners"       => [Brightbox::Compute::Formats::Struct::LB_LISTENER],
-          "policy"          => String,
-          "healthcheck"     => Brightbox::Compute::Formats::Struct::LB_HEALTHCHECK,
-          "created_at"      => String,
-          "deleted_at"      => Fog::Nullable::String,
-          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
-          "nodes"           => [Brightbox::Compute::Formats::Nested::SERVER],
-          "cloud_ips"       => [Brightbox::Compute::Formats::Nested::CLOUD_IP]
-        }
-
-        SERVER = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => String,
-          "status"          => String,
-          "hostname"        => String,
-          "fqdn"            => String,
-          "created_at"      => String,
-          "started_at"      => Fog::Nullable::String,
-          "deleted_at"      => Fog::Nullable::String,
-          "user_data"       => Fog::Nullable::String,
-          "console_url"     => Fog::Nullable::String,
-          "console_token"   => Fog::Nullable::String,
-          "console_token_expires" => Fog::Nullable::String,
-          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
-          "server_type"     => Brightbox::Compute::Formats::Nested::SERVER_TYPE,
-          "cloud_ips"       => [Brightbox::Compute::Formats::Nested::CLOUD_IP],
-          "image"           => Brightbox::Compute::Formats::Nested::IMAGE,
-          "snapshots"       => [Brightbox::Compute::Formats::Nested::IMAGE],
-          "server_groups"   => [Brightbox::Compute::Formats::Nested::SERVER_GROUP],
-          "interfaces"      => [Brightbox::Compute::Formats::Nested::INTERFACE],
-          "zone"            => Fog::Brightbox::Nullable::Zone,
-          "licence_name"    => Fog::Nullable::String,
-          "username"        => Fog::Nullable::String,
-          "compatibility_mode" => Fog::Boolean
-        }
-
-        SERVER_GROUP = {
-          "created_at"      => String,
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => String,
-          "description"     => Fog::Nullable::String,
-          "default"         => Fog::Boolean,
-          "created_at"      => String,
-          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
-          "servers"         => [Brightbox::Compute::Formats::Nested::SERVER],
-          "firewall_policy" => Fog::Brightbox::Nullable::FirewallPolicy
-        }
-
-        SERVER_TYPE = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "handle"          => Fog::Nullable::String,
-          "name"            => String,
-          "status"          => String,
-          "cores"           => Integer,
-          "ram"             => Integer,
-          "disk_size"       => Integer
-        }
-
-        USER = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "name"            => String,
-          "email_address"   => String,
-          "email_verified"  => Fog::Boolean,
-          "accounts"        => [Brightbox::Compute::Formats::Nested::ACCOUNT],
-          "default_account" => Fog::Brightbox::Nullable::Account,
-          "ssh_key"         => Fog::Nullable::String,
-          "messaging_pref"  => Fog::Boolean
-        }
-
-        COLLABORATION = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "status"          => String,
-          "role"            => String,
-          "role_label"      => String,
-          "email"           => Fog::Nullable::String,
-          "user"            => Fog::Brightbox::Nullable::User,
-          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
-          "inviter"         => Brightbox::Compute::Formats::Nested::USER
-        }
-
-        ZONE = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "handle"          => String
-        }
-      end
-
-      module Collection
-        ACCOUNTS = [Brightbox::Compute::Formats::Collected::ACCOUNT]
-        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]
-        FIREWALL_POLICIES = [Brightbox::Compute::Formats::Collected::FIREWALL_POLICY]
-        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
 end