brightbox-cli 0.14.1 → 0.15.0

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/simpledb/attributes_tests.rb

@@ -2,57 +2,57 @@ Shindo.tests('AWS::SimpleDB | attributes requests', ['aws']) do
 
   @domain_name = "fog_domain_#{Time.now.to_f.to_s.gsub('.','')}"
 
-  Fog::AWS[:sdb].create_domain(@domain_name)
+  Fog::AWS[:simpledb].create_domain(@domain_name)
 
   tests('success') do
 
     tests("#batch_put_attributes('#{@domain_name}', { 'a' => { 'b' => 'c', 'd' => 'e' }, 'x' => { 'y' => 'z' } }).body").formats(AWS::SimpleDB::Formats::BASIC) do
-      Fog::AWS[:sdb].batch_put_attributes(@domain_name, { 'a' => { 'b' => 'c', 'd' => 'e' }, 'x' => { 'y' => 'z' } }).body
+      Fog::AWS[:simpledb].batch_put_attributes(@domain_name, { 'a' => { 'b' => 'c', 'd' => 'e' }, 'x' => { 'y' => 'z' } }).body
     end
 
     tests("#get_attributes('#{@domain_name}', 'a', {'ConsistentRead' => true}).body['Attributes']").returns({'b' => ['c'], 'd' => ['e']}) do
-      Fog::AWS[:sdb].get_attributes(@domain_name, 'a', {'ConsistentRead' => true}).body['Attributes']
+      Fog::AWS[:simpledb].get_attributes(@domain_name, 'a', {'ConsistentRead' => true}).body['Attributes']
     end
 
     tests("#get_attributes('#{@domain_name}', 'AttributeName' => 'notanattribute')").succeeds do
-      Fog::AWS[:sdb].get_attributes(@domain_name, 'AttributeName' => 'notanattribute')
+      Fog::AWS[:simpledb].get_attributes(@domain_name, 'AttributeName' => 'notanattribute')
     end
 
     tests("#select('select * from #{@domain_name}', {'ConsistentRead' => true}).body['Items']").returns({'a' => { 'b' => ['c'], 'd' => ['e']}, 'x' => { 'y' => ['z'] } }) do
       pending if Fog.mocking?
-      Fog::AWS[:sdb].select("select * from #{@domain_name}", {'ConsistentRead' => true}).body['Items']
+      Fog::AWS[:simpledb].select("select * from #{@domain_name}", {'ConsistentRead' => true}).body['Items']
     end
 
     tests("#put_attributes('#{@domain_name}', 'conditional', { 'version' => '1' }).body").formats(AWS::SimpleDB::Formats::BASIC) do
-      Fog::AWS[:sdb].put_attributes(@domain_name, 'conditional', { 'version' => '1' }).body
+      Fog::AWS[:simpledb].put_attributes(@domain_name, 'conditional', { 'version' => '1' }).body
     end
 
     tests("#put_attributes('#{@domain_name}', 'conditional', { 'version' => '2' }, :expect => { 'version' => '1' }, :replace => ['version']).body").formats(AWS::SimpleDB::Formats::BASIC) do
-      Fog::AWS[:sdb].put_attributes(@domain_name, 'conditional', { 'version' => '2' }, :expect => { 'version' => '1' }, :replace => ['version']).body
+      Fog::AWS[:simpledb].put_attributes(@domain_name, 'conditional', { 'version' => '2' }, :expect => { 'version' => '1' }, :replace => ['version']).body
     end
 
     # Verify that we can delete individual attributes.
     tests("#delete_attributes('#{@domain_name}', 'a', {'d' => []})").succeeds do
-      Fog::AWS[:sdb].delete_attributes(@domain_name, 'a', {'d' => []}).body
+      Fog::AWS[:simpledb].delete_attributes(@domain_name, 'a', {'d' => []}).body
     end
 
     # Verify that individually deleted attributes are actually removed.
     tests("#get_attributes('#{@domain_name}', 'a', {'AttributeName' => ['d'], 'ConsistentRead' => true}).body['Attributes']").returns({}) do
-      Fog::AWS[:sdb].get_attributes(@domain_name, 'a', {'AttributeName' => ['d'], 'ConsistentRead' => true}).body['Attributes']
+      Fog::AWS[:simpledb].get_attributes(@domain_name, 'a', {'AttributeName' => ['d'], 'ConsistentRead' => true}).body['Attributes']
     end
 
     tests("#delete_attributes('#{@domain_name}', 'a').body").formats(AWS::SimpleDB::Formats::BASIC) do
-      Fog::AWS[:sdb].delete_attributes(@domain_name, 'a').body
+      Fog::AWS[:simpledb].delete_attributes(@domain_name, 'a').body
     end
 
     # Verify that we can delete entire domain, item combinations.
     tests("#delete_attributes('#{@domain_name}', 'a').body").succeeds do
-      Fog::AWS[:sdb].delete_attributes(@domain_name, 'a').body
+      Fog::AWS[:simpledb].delete_attributes(@domain_name, 'a').body
     end
 
     # Verify that deleting a domain, item combination removes all related attributes.
     tests("#get_attributes('#{@domain_name}', 'a', {'ConsistentRead' => true}).body['Attributes']").returns({}) do
-      Fog::AWS[:sdb].get_attributes(@domain_name, 'a', {'ConsistentRead' => true}).body['Attributes']
+      Fog::AWS[:simpledb].get_attributes(@domain_name, 'a', {'ConsistentRead' => true}).body['Attributes']
     end
 
   end
@@ -60,27 +60,27 @@ Shindo.tests('AWS::SimpleDB | attributes requests', ['aws']) do
   tests('failure') do
 
     tests("#batch_put_attributes('notadomain', { 'a' => { 'b' => 'c' }, 'x' => { 'y' => 'z' } })").raises(Excon::Errors::BadRequest) do
-      Fog::AWS[:sdb].batch_put_attributes('notadomain', { 'a' => { 'b' => 'c' }, 'x' => { 'y' => 'z' } })
+      Fog::AWS[:simpledb].batch_put_attributes('notadomain', { 'a' => { 'b' => 'c' }, 'x' => { 'y' => 'z' } })
     end
 
     tests("#get_attributes('notadomain', 'a')").raises(Excon::Errors::BadRequest) do
-      Fog::AWS[:sdb].get_attributes('notadomain', 'a')
+      Fog::AWS[:simpledb].get_attributes('notadomain', 'a')
     end
 
     tests("#put_attributes('notadomain', 'conditional', { 'version' => '1' })").raises(Excon::Errors::BadRequest) do
-      Fog::AWS[:sdb].put_attributes('notadomain', 'foo', { 'version' => '1' })
+      Fog::AWS[:simpledb].put_attributes('notadomain', 'foo', { 'version' => '1' })
     end
 
     tests("#put_attributes('#{@domain_name}', 'conditional', { 'version' => '2' }, :expect => { 'version' => '1' }, :replace => ['version'])").raises(Excon::Errors::Conflict) do
-      Fog::AWS[:sdb].put_attributes(@domain_name, 'conditional', { 'version' => '2' }, :expect => { 'version' => '1' }, :replace => ['version'])
+      Fog::AWS[:simpledb].put_attributes(@domain_name, 'conditional', { 'version' => '2' }, :expect => { 'version' => '1' }, :replace => ['version'])
     end
 
     tests("#delete_attributes('notadomain', 'a')").raises(Excon::Errors::BadRequest) do
-      Fog::AWS[:sdb].delete_attributes('notadomain', 'a')
+      Fog::AWS[:simpledb].delete_attributes('notadomain', 'a')
     end
 
   end
 
-  Fog::AWS[:sdb].delete_domain(@domain_name)
+  Fog::AWS[:simpledb].delete_domain(@domain_name)
 
 end

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/simpledb/domain_tests.rb

@@ -15,27 +15,27 @@ Shindo.tests('AWS::SimpleDB | domain requests', ['aws']) do
   tests('success') do
 
     tests("#create_domain(#{@domain_name})").formats(AWS::SimpleDB::Formats::BASIC) do
-      Fog::AWS[:sdb].create_domain(@domain_name).body
+      Fog::AWS[:simpledb].create_domain(@domain_name).body
     end
 
     tests("#create_domain(#{@domain_name})").succeeds do
-      Fog::AWS[:sdb].create_domain(@domain_name)
+      Fog::AWS[:simpledb].create_domain(@domain_name)
     end
 
     tests("#domain_metadata(#{@domain_name})").formats(@domain_metadata_format) do
-      Fog::AWS[:sdb].domain_metadata(@domain_name).body
+      Fog::AWS[:simpledb].domain_metadata(@domain_name).body
     end
 
     tests("#list_domains").formats(AWS::SimpleDB::Formats::BASIC.merge('Domains' => [String])) do
-      Fog::AWS[:sdb].list_domains.body
+      Fog::AWS[:simpledb].list_domains.body
     end
 
     tests("#delete_domain(#{@domain_name})").formats(AWS::SimpleDB::Formats::BASIC) do
-      Fog::AWS[:sdb].delete_domain(@domain_name).body
+      Fog::AWS[:simpledb].delete_domain(@domain_name).body
     end
 
     tests("#delete_domain(#{@domain_name})").succeeds do
-      Fog::AWS[:sdb].delete_domain(@domain_name)
+      Fog::AWS[:simpledb].delete_domain(@domain_name)
     end
 
   end
@@ -43,7 +43,7 @@ Shindo.tests('AWS::SimpleDB | domain requests', ['aws']) do
   tests('failure') do
 
     tests("#domain_metadata('notadomain')").raises(Excon::Errors::BadRequest) do
-      Fog::AWS[:sdb].domain_metadata('notadomain')
+      Fog::AWS[:simpledb].domain_metadata('notadomain')
     end
 
   end

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/sqs/message_tests.rb

@@ -2,9 +2,7 @@ Shindo.tests('AWS::SQS | message requests', ['aws']) do
 
   tests('success') do
 
-    unless Fog.mocking?
-      @queue_url = Fog::AWS[:sqs].create_queue('fog_message_tests').body['QueueUrl']
-    end
+    @queue_url = Fog::AWS[:sqs].create_queue('fog_message_tests').body['QueueUrl']
 
     send_message_format = AWS::SQS::Formats::BASIC.merge({
       'MessageId'         => String,
@@ -12,7 +10,6 @@ Shindo.tests('AWS::SQS | message requests', ['aws']) do
     })
 
     tests("#send_message('#{@queue_url}', 'message')").formats(send_message_format) do
-      pending if Fog.mocking?
       Fog::AWS[:sqs].send_message(@queue_url, 'message').body
     end
 
@@ -32,19 +29,16 @@ Shindo.tests('AWS::SQS | message requests', ['aws']) do
     })
 
     tests("#receive_message").formats(receive_message_format) do
-      pending if Fog.mocking?
       data = Fog::AWS[:sqs].receive_message(@queue_url).body
       @receipt_handle = data['Message'].first['ReceiptHandle']
       data
     end
 
     tests("#change_message_visibility('#{@queue_url}, '#{@receipt_handle}', 60)").formats(AWS::SQS::Formats::BASIC) do
-      pending if Fog.mocking?
       Fog::AWS[:sqs].change_message_visibility(@queue_url, @receipt_handle, 60).body
     end
 
     tests("#delete_message('#{@queue_url}', '#{@receipt_handle}')").formats(AWS::SQS::Formats::BASIC) do
-      pending if Fog.mocking?
       Fog::AWS[:sqs].delete_message(@queue_url, @receipt_handle).body
     end
 

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/sqs/queue_tests.rb

@@ -7,7 +7,6 @@ Shindo.tests('AWS::SQS | queue requests', ['aws']) do
     })
 
     tests("#create_queue('fog_queue_tests')").formats(create_queue_format) do
-      pending if Fog.mocking?
       data = Fog::AWS[:sqs].create_queue('fog_queue_tests').body
       @queue_url = data['QueueUrl']
       data
@@ -18,12 +17,10 @@ Shindo.tests('AWS::SQS | queue requests', ['aws']) do
     })
 
     tests("#list_queues").formats(list_queues_format) do
-      pending if Fog.mocking?
       Fog::AWS[:sqs].list_queues.body
     end
 
     tests("#set_queue_attributes('#{@queue_url}', 'VisibilityTimeout', 60)").formats(AWS::SQS::Formats::BASIC) do
-      pending if Fog.mocking?
       Fog::AWS[:sqs].set_queue_attributes(@queue_url, 'VisibilityTimeout', 60).body
     end
 
@@ -41,12 +38,10 @@ Shindo.tests('AWS::SQS | queue requests', ['aws']) do
     })
 
     tests("#get_queue_attributes('#{@queue_url}', 'All')").formats(get_queue_attributes_format) do
-      pending if Fog.mocking?
       Fog::AWS[:sqs].get_queue_attributes(@queue_url, 'All').body
     end
 
     tests("#delete_queue('#{@queue_url}')").formats(AWS::SQS::Formats::BASIC) do
-      pending if Fog.mocking?
       Fog::AWS[:sqs].delete_queue(@queue_url).body
     end
 

data/lib/brightbox-cli/vendor/fog/tests/brightbox/requests/compute/load_balancer_tests.rb

@@ -34,6 +34,7 @@ Shindo.tests('Fog::Compute[:brightbox] | load balancer requests', ['brightbox'])
     end
 
     tests("#list_load_balancers()").formats(Brightbox::Compute::Formats::Collection::LOAD_BALANCERS) do
+      pending if Fog.mocking?
       Fog::Compute[:brightbox].list_load_balancers
     end
 

data/lib/brightbox-cli/vendor/fog/tests/compute/models/flavors_tests.rb

@@ -1,6 +1,6 @@
 for provider, config in compute_providers
 
-  next if [:voxel].include?(provider)
+  next if [:glesys, :voxel].include?(provider)
 
   Shindo.tests("Fog::Compute[:#{provider}] | flavors", [provider]) do
 

data/lib/brightbox-cli/vendor/fog/tests/core/attribute_tests.rb

@@ -1,6 +1,7 @@
 class FogAttributeTestModel < Fog::Model
   attribute :key, :aliases => 'keys', :squash => "id"
   attribute :time, :type => :time
+  attribute :bool, :type => :boolean
 end
 
 Shindo.tests('Fog::Attributes', 'core') do
@@ -51,4 +52,32 @@ Shindo.tests('Fog::Attributes', 'core') do
 
   end
 
+  tests(':type => :boolean') do
+    tests(':bool => "true"').returns(true) do
+      @model.merge_attributes(:bool => 'true')
+      @model.bool
+    end
+
+    tests(':bool => true').returns(true) do
+      @model.merge_attributes(:bool => true)
+      @model.bool
+    end
+    
+    tests(':bool => "false"').returns(false) do
+      @model.merge_attributes(:bool => 'false')
+      @model.bool
+    end
+
+    tests(':bool => false').returns(false) do
+      @model.merge_attributes(:bool => false)
+      @model.bool
+    end
+
+    tests(':bool => "foo"').returns(nil) do
+      @model.merge_attributes(:bool => "foo")
+      @model.bool
+    end
+  
+  end
+
 end

data/lib/brightbox-cli/vendor/fog/tests/core/credential_tests.rb

@@ -3,6 +3,7 @@ Shindo.tests do
     @old_home = ENV['HOME']
     @old_rc   = ENV['FOG_RC']
     @old_credential = ENV['FOG_CREDENTIAL']
+    @old_credentials = Fog.credentials
     Fog.instance_variable_set('@credential_path', nil) # kill memoization
     Fog.instance_variable_set('@credential', nil) # kill memoization
   end
@@ -11,6 +12,7 @@ Shindo.tests do
     ENV['HOME'] = @old_home
     ENV['FOG_RC'] = @old_rc
     ENV['FOG_CREDENTIAL'] = @old_credential
+    Fog.credentials = @old_credentials
   end
 
   tests('credential') do

data/lib/brightbox-cli/vendor/fog/tests/helper.rb

@@ -8,7 +8,7 @@ def lorem_file
 end
 
 # check to see which credentials are available and add others to the skipped tags list
-all_providers = ['aws', 'bluebox', 'brightbox', 'dnsimple', 'dnsmadeeasy', 'dynect', 'ecloud', 'glesys', 'gogrid', 'google', 'linode', 'local', 'ninefold', 'newservers', 'rackspace', 'slicehost', 'stormondemand', 'voxel', 'zerigo']
+all_providers = ['aws', 'bluebox', 'brightbox', 'dnsimple', 'dnsmadeeasy', 'dynect', 'ecloud', 'glesys', 'gogrid', 'google', 'linode', 'local', 'ninefold', 'newservers', 'openstack', 'rackspace', 'slicehost', 'stormondemand', 'voxel', 'zerigo']
 available_providers = Fog.available_providers.map {|provider| provider.downcase}
 for provider in (all_providers - available_providers)
   Formatador.display_line("[yellow]Skipping tests for [bold]#{provider}[/] [yellow]due to lacking credentials (add some to '~/.fog' to run them)[/]")

data/lib/brightbox-cli/vendor/fog/tests/helpers/collection_helper.rb

@@ -12,6 +12,11 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
       @instance = collection.create(params)
     end
 
+    # FIXME: work around for timing issue on AWS describe_instances mocks
+    if Fog.mocking? && @instance.respond_to?(:ready?)
+      @instance.wait_for { ready? }
+    end
+
     tests("#all").succeeds do
       pending if Fog.mocking? && !mocks_implemented
       collection.all

data/lib/brightbox-cli/vendor/fog/tests/helpers/compute/server_helper.rb

@@ -4,6 +4,7 @@ def server_tests(connection, params = {}, mocks_implemented = true)
 
     tests('#reload').returns(true) do
       pending if Fog.mocking? && !mocks_implemented
+      @instance.wait_for { ready? }
       identity = @instance.identity
       !identity.nil? && identity == @instance.reload.identity
     end

data/lib/brightbox-cli/vendor/fog/tests/helpers/formats_helper.rb

@@ -9,6 +9,8 @@ module Fog
     module String; end
     module Time; end
     module Float; end
+    module Hash; end
+    module Array; end
   end
 end
 [FalseClass, TrueClass].each {|klass| klass.send(:include, Fog::Boolean)}
@@ -17,21 +19,23 @@ end
 [NilClass, Time].each {|klass| klass.send(:include, Fog::Nullable::Time)}
 [Integer, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Integer)}
 [Float, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Float)}
+[Hash, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Hash)}
+[Array, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Array)}
 
 module Shindo
   class Tests
 
-    def formats(format)
+    def formats(format, strict=true)
       raise ArgumentError, 'format is nil' unless format
 
       test('has proper format') do
-        formats_kernel(instance_eval(&Proc.new), format)
+        formats_kernel(instance_eval(&Proc.new), format, true, strict)
       end
     end
 
     private
 
-    def formats_kernel(original_data, original_format, original = true)
+    def formats_kernel(original_data, original_format, original = true, strict = true)
       valid = true
       data = original_data.dup
       format = original_format.dup
@@ -44,20 +48,20 @@ module Shindo
         format.delete(key)
         case value
         when Array
-          valid &&= datum.is_a?(Array) || p("not Array: #{datum.inspect}")
+          valid &&= datum.is_a?(Array) || p("#{key.inspect} not Array: #{datum.inspect}")
           if datum.is_a?(Array) && !value.empty?
             for element in datum
               type = value.first
               if type.is_a?(Hash)
-                valid &&= formats_kernel({:element => element}, {:element => type}, false)
+                valid &&= formats_kernel({:element => element}, {:element => type}, false, strict)
               else
                 valid &&= element.is_a?(type)
               end
             end
           end
         when Hash
-          valid &&= datum.is_a?(Hash) || p("not Hash: #{datum.inspect}")
-          valid &&= formats_kernel(datum, value, false)
+          valid &&= datum.is_a?(Hash) || p("#{key.inspect} not Hash: #{datum.inspect}")
+          valid &&= formats_kernel(datum, value, false, strict)
         else
           p "#{key.inspect} not #{value.inspect}: #{datum.inspect}" unless datum.is_a?(value)
           valid &&= datum.is_a?(value)
@@ -65,7 +69,11 @@ module Shindo
       end
       p data unless data.empty?
       p format unless format.empty?
-      valid &&= data.empty? && format.empty?
+      if strict
+        valid &&= data.empty? && format.empty?
+      else
+        valid &&= format.empty?
+      end
       if !valid && original
         @message = "#{original_data.inspect} does not match #{original_format.inspect}"
       end

data/lib/brightbox-cli/vendor/fog/tests/helpers/formats_helper_tests.rb

@@ -20,6 +20,10 @@ Shindo.tests('test_helper', 'meta') do
         formats_kernel([{:a => :b}], [{:a => Symbol}])
       end
 
+      test('non strict extra data') do
+        formats_kernel({:a => :b, :b => :c}, {:a => Symbol}, true, false)
+      end
+
     end
 
     tests('returns false') do
@@ -36,6 +40,10 @@ Shindo.tests('test_helper', 'meta') do
         !formats_kernel({}, {:a => String})
       end
 
+      test('non strict extra data') do
+        !formats_kernel({:a => :b, :b => :c}, {:z => Symbol}, true, false)
+      end
+
     end
 
   end

data/lib/brightbox-cli/vendor/fog/tests/helpers/mock_helper.rb

@@ -8,7 +8,7 @@ end
 
 # if in mocked mode, fill in some fake credentials for us
 if Fog.mock?
-  Fog.instance_variable_set(:@credentials, {
+  Fog.credentials = {
     :aws_access_key_id                => 'aws_access_key_id',
     :aws_secret_access_key            => 'aws_secret_access_key',
     :bluebox_api_key                  => 'bluebox_api_key',
@@ -38,6 +38,10 @@ if Fog.mock?
     :ninefold_storage_token           => 'ninefold_storage_token',
 #    :public_key_path                  => '~/.ssh/id_rsa.pub',
 #    :private_key_path                 => '~/.ssh/id_rsa',
+    :openstack_api_key                => 'openstack_api_key',
+    :openstack_username               => 'openstack_username',
+    :openstack_tenant                 => 'openstack_tenant',
+    :openstack_auth_url               => 'openstack_auth_url',
     :rackspace_api_key                => 'rackspace_api_key',
     :rackspace_username               => 'rackspace_username',
     :slicehost_password               => 'slicehost_password',
@@ -57,5 +61,5 @@ if Fog.mock?
     :vsphere_username                 => 'apiuser',
     :vsphere_password                 => 'apipassword',
     :vsphere_expected_pubkey_hash     => 'abcdef1234567890'
-  })
+  }
 end

data/lib/brightbox-cli/vendor/fog/tests/linode/requests/compute/linodeplans_tests.rb

@@ -7,7 +7,8 @@ Shindo.tests('Fog::Compute[:linode] | linodeplans requests', ['linode']) do
          '3' => Integer,
          '4' => Integer,
          '6' => Integer,
-         '7' => Integer
+         '7' => Integer,
+         '8' => Integer
       },
       'DISK'    => Integer,
       'PLANID'  => Integer,

data/lib/brightbox-cli/vendor/fog/tests/ninefold/requests/compute/helper.rb

@@ -37,9 +37,13 @@ class Ninefold
           "storagetype" => String,
           "offerha" => Fog::Boolean,
           "domainid" => Integer,
-          "domain" => String
+          "domain" => String,
+          "issystem" => Fog::Boolean,
+          "limitcpuuse" => Fog::Boolean,
+          "defaultuse" => Fog::Boolean
+
         }
-        #SERVICE_OFFERINGS = [Ninefold::Compute::Formats::Lists::SERVICE_OFFERING]
+        SERVICE_OFFERINGS = [Ninefold::Compute::Formats::Lists::SERVICE_OFFERING]
         ACCOUNTS = [{
                       "id"=>Integer,
                       "name"=>String,
@@ -95,19 +99,6 @@ class Ninefold
                     "state"=>String,
                     "parentid"=>Integer
                   }]
-        SERVICE_OFFERINGS = [{
-                               "id"=>Integer,
-                               "name"=>String,
-                               "displaytext"=>String,
-                               "cpunumber"=>Integer,
-                               "cpuspeed"=>Integer,
-                               "memory"=>Integer,
-                               "created"=>String,
-                               "storagetype"=>String,
-                               "offerha"=>Fog::Boolean,
-                               "domainid"=>Integer,
-                               "domain"=>String
-                             }]
         DISK_OFFERINGS = [{
                             "id"=>Integer,
                             "domainid"=>Integer,
@@ -129,6 +120,7 @@ class Ninefold
                        }]
         ZONES = [{
                    "allocationstate"=>String,
+                   "dhcpprovider"=>String,
                    "id"=>Integer,
                    "name"=>String,
                    "networktype"=>String,
@@ -266,8 +258,13 @@ class Ninefold
                     "domain"=>String,
                     "isdefault"=>Fog::Boolean,
                     "service"=>Array,
-                    "networkdomain"=>String,
-                    "securitygroupenabled"=>Fog::Boolean
+                    "networkdomain"=>Fog::Nullable::String,
+                    "securitygroupenabled"=>Fog::Boolean,
+                    "netmask"=>Fog::Nullable::String,
+                    "startip"=>Fog::Nullable::String,
+                    "endip"=>Fog::Nullable::String,
+                    "gateway"=>Fog::Nullable::String,
+                    "vlan"=>Fog::Nullable::String
                     }]
       end
       module Addresses

data/lib/brightbox-cli/vendor/fog/tests/openstack/requests/compute/flavor_tests.rb

@@ -0,0 +1,35 @@
+Shindo.tests('Fog::Compute[:openstack] | flavor requests', ['openstack']) do
+
+  @flavor_format = {
+    'id'    => String,
+    'name'  => String,
+    'disk'  => Integer,
+    'ram'   => Integer,
+    'links'  => Array
+  }
+
+  tests('success') do
+
+    tests('#get_flavor_details(1)').formats(@flavor_format, false) do
+      Fog::Compute[:openstack].get_flavor_details("1").body['flavor']
+    end
+
+    tests('#list_flavors').formats({'flavors' => [OpenStack::Compute::Formats::SUMMARY]}) do
+      Fog::Compute[:openstack].list_flavors.body
+    end
+
+    tests('#list_flavors_detail').formats({'flavors' => [@flavor_format]}, false) do
+      Fog::Compute[:openstack].list_flavors_detail.body
+    end
+
+  end
+
+  tests('failure') do
+
+    tests('#get_flavor_details(0)').raises(Fog::Compute::OpenStack::NotFound) do
+      Fog::Compute[:openstack].get_flavor_details("0")
+    end
+
+  end
+
+end

data/lib/brightbox-cli/vendor/fog/tests/openstack/requests/compute/helper.rb

@@ -0,0 +1,17 @@
+class OpenStack
+
+  module Compute
+
+    module Formats
+
+      SUMMARY = {
+        'id'    => String,
+        'name'  => String,
+        'links'  => Array
+      }
+
+    end
+
+  end
+
+end

data/lib/brightbox-cli/vendor/fog/tests/openstack/requests/compute/image_tests.rb

@@ -0,0 +1,59 @@
+require 'fog/openstack'
+
+Shindo.tests('Fog::Compute[:openstack] | image requests', ['openstack']) do
+
+  @image_format = {
+    'created'   => Fog::Nullable::String,
+    'id'        => String,
+    'name'      => String,
+    'progress'  => Fog::Nullable::Integer,
+    'status'    => String,
+    'updated'   => String,
+    'minRam'    => Integer,
+    'minDisk'   => Integer,
+    'server'    => Fog::Nullable::Hash,
+    'metadata'  => Hash,
+    'links'  => Array
+  }
+
+  tests('success') do
+
+    @image_id = Fog::Compute[:openstack].images[0].id
+
+    unless Fog.mocking?
+      Fog::Compute[:openstack].images.get(@image_id).wait_for { ready? }
+    end
+    tests("#get_image_details(#{@image_id})").formats(@image_format) do
+      pending if Fog.mocking?
+      Fog::Compute[:openstack].get_image_details(@image_id).body['image']
+    end
+
+    tests('#list_images').formats({'images' => [OpenStack::Compute::Formats::SUMMARY]}) do
+      Fog::Compute[:openstack].list_images.body
+    end
+
+    tests('#list_images_detail').formats({'images' => [@image_format]}) do
+      Fog::Compute[:openstack].list_images_detail.body
+    end
+
+    unless Fog.mocking?
+      Fog::Compute[:openstack].images.get(@image_id).wait_for { ready? }
+    end
+
+  end
+
+  tests('failure') do
+
+    tests('#delete_image(0)').raises(Fog::Compute::OpenStack::NotFound) do
+      pending if Fog.mocking?
+      Fog::Compute[:openstack].delete_image(0)
+    end
+
+    tests('#get_image_details(0)').raises(Fog::Compute::OpenStack::NotFound) do
+      pending if Fog.mocking?
+      Fog::Compute[:openstack].get_image_details(0)
+    end
+
+  end
+
+end